Merge branch 'master' into newmc
authorMarius Gavrilescu <marius@ieval.ro>
Mon, 4 May 2015 12:08:39 +0000 (15:08 +0300)
committerMarius Gavrilescu <marius@ieval.ro>
Mon, 4 May 2015 12:08:39 +0000 (15:08 +0300)
commit0ffa7a2279c36443ce58a2b0d383e45011b7230e
treecb5ce10c7e75e67c8bb7ad9aec86eda435044c8d
parent903884f77afb6ef2a1d842c20bb495aa76ee7a77
parent74b0b0abbf8f49d6444c7df9465d943fbad69704
Merge branch 'master' into newmc

Conflicts:
js/90-mobilenav.js
js/90-mobilenav.js
js/90-nav.js
js/90-themes.js
This page took 0.009874 seconds and 4 git commands to generate.