From: Marius Gavrilescu Date: Wed, 8 Apr 2015 17:30:49 +0000 (+0300) Subject: Merge branch 'master' into newmc X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;ds=sidebyside;h=21dc66dbe148a63d1e056e3b3c03933889392fc2;hp=-c;p=gruntmaster-page.git Merge branch 'master' into newmc Conflicts: tmpl/skel.en --- 21dc66dbe148a63d1e056e3b3c03933889392fc2 diff --combined tmpl/skel.en index 906bbb6,82e6a13..05edad8 --- a/tmpl/skel.en +++ b/tmpl/skel.en @@@ -3,69 -3,35 +3,66 @@@ - - + + + - -
+ -

TITLE

-
This is a static version of Gruntmaster 6000.
+
This is a static version of MindCoding, useful when the regular version is overloaded.
Content goes here
+ + +
+

Official sponsors

+ + + + + + + +
+