Merge branch 'master' into newmc
authorMarius Gavrilescu <marius@ieval.ro>
Sun, 19 Apr 2015 18:33:50 +0000 (21:33 +0300)
committerMarius Gavrilescu <marius@ieval.ro>
Sun, 19 Apr 2015 18:33:50 +0000 (21:33 +0300)
commitb8d36f0686c49a0220cc4c1ef59e47759f7a10f8
tree6bef848e9a07d4289a4105dd551f8efe145d301f
parent9028f5d361530a04d8664351e7b78ca25bf4ce81
parent5eae1f77a18ef8273f3a0cd6d4af8c19a4986880
Merge branch 'master' into newmc

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