Merge branch 'master' into newmc
authorMarius Gavrilescu <marius@ieval.ro>
Fri, 3 Apr 2015 08:22:08 +0000 (11:22 +0300)
committerMarius Gavrilescu <marius@ieval.ro>
Fri, 3 Apr 2015 08:22:08 +0000 (11:22 +0300)
commit1964c8579557d5244f9032ce36bd02e02661709f
tree2fb5c44eae5ddaff7bb346f80f36709aff7f0caa
parentbc188d0bb1aa436df1261a7840c2c6834d1def71
parentd19d29a6945493994df05ac88beb4ef38a78b77e
Merge branch 'master' into newmc

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