Merge branch 'master' into newmc
authorMarius Gavrilescu <marius@ieval.ro>
Tue, 10 Mar 2015 19:15:34 +0000 (21:15 +0200)
committerMarius Gavrilescu <marius@ieval.ro>
Tue, 10 Mar 2015 19:15:34 +0000 (21:15 +0200)
commit268c695bdb59abe79704eeebe9569e224bb3b394
tree174fa179db00d98e2d5b2d698b11b3f89395d43b
parent69d77267e240ef389facf309d33d4cbe68a98895
parentd53c616a782a89da8c980d29ee65d1f3b34b6f27
Merge branch 'master' into newmc

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