]> iEval git - plack-app-gruntmaster.git/commitdiff
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)
Conflicts:
css/custom.css

1  2 
css/custom.css
js/90-themes.js

diff --cc css/custom.css
Simple merge
diff --cc js/90-themes.js
Simple merge
This page took 0.029818 seconds and 4 git commands to generate.