Merge branch 'master' into newmc
authorMarius Gavrilescu <marius@ieval.ro>
Mon, 20 Apr 2015 07:42:21 +0000 (10:42 +0300)
committerMarius Gavrilescu <marius@ieval.ro>
Mon, 20 Apr 2015 07:42:21 +0000 (10:42 +0300)
commit260a6894d9fdfe3cd2f05cd1926b77b46119dc01
treecf5dd579975ce0fed74e576254e0baa4cc9017fc
parentd19b7b577a3b51ad59f88cf0057bf9ff49343d7e
parent74da6b38dd00947961f695e1f4f6fa61ea40e93f
Merge branch 'master' into newmc

Conflicts:
css/custom.css
css/custom.css
js/90-themes.js
This page took 0.010707 seconds and 4 git commands to generate.