From: Marius Gavrilescu Date: Mon, 23 Feb 2015 14:39:04 +0000 (+0200) Subject: Merge branch 'master' into newmc X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=898dded38238e89ca0932d23a6a4d3b3759c9cbf;hp=-c;p=gruntmaster-page.git Merge branch 'master' into newmc Conflicts: tmpl/skel.en --- 898dded38238e89ca0932d23a6a4d3b3759c9cbf diff --combined tmpl/skel.en index df74092,de00cd8..c28e1f7 --- a/tmpl/skel.en +++ b/tmpl/skel.en @@@ -3,20 -3,19 +3,20 @@@ - - + - ++
+

TITLE

@@@ -39,7 -37,6 +39,7 @@@
Content goes here
+

Track user

@@@ -63,34 -60,8 +63,34 @@@ Tracking +

Official sponsors

+ + + + + + + +
+