]> iEval git - plack-app-gruntmaster.git/commitdiff
Merge branch 'master' into newmc
authorMarius Gavrilescu <marius@ieval.ro>
Sat, 28 Feb 2015 18:18:51 +0000 (20:18 +0200)
committerMarius Gavrilescu <marius@ieval.ro>
Sat, 28 Feb 2015 18:18:51 +0000 (20:18 +0200)
1  2 
js/90-themes.js
tmpl/skel.en

diff --cc js/90-themes.js
Simple merge
diff --cc tmpl/skel.en
Simple merge
This page took 0.030086 seconds and 4 git commands to generate.