From: Marius Gavrilescu Date: Sat, 21 Mar 2015 17:16:35 +0000 (+0200) Subject: Merge branch 'master' into newmc X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=5d3c8a5435a93f9f1d1fbb1c78d32790e7f641d4;p=gruntmaster-page.git Merge branch 'master' into newmc Conflicts: tmpl/skel.en --- 5d3c8a5435a93f9f1d1fbb1c78d32790e7f641d4 diff --cc tmpl/skel.en index 3b363b9,6ae836a..364234e --- a/tmpl/skel.en +++ b/tmpl/skel.en @@@ -18,8 -17,7 +18,8 @@@