]> iEval git - gruntmaster-page.git/commit - app.psgi
Merge branch 'master' into newmc
authorMarius Gavrilescu <marius@ieval.ro>
Mon, 2 Mar 2015 15:08:18 +0000 (17:08 +0200)
committerMarius Gavrilescu <marius@ieval.ro>
Mon, 2 Mar 2015 15:08:18 +0000 (17:08 +0200)
commitd2a977e374a40ff05a877e183f2d015ae0f1b877
tree486db4e5b6dc4f1a588a555c8f58c1b83dd6e7cd
parenta8dc218ceb178e05b574deed4090503fa9be3502
parent399f4202076ade6a9857f9f53018cc1ce89c0300
Merge branch 'master' into newmc

Conflicts:
js/90-themes.js
tmpl/skel.en
app.psgi
js/90-themes.js
tmpl/skel.en
This page took 0.026288 seconds and 4 git commands to generate.