From: Marius Gavrilescu Date: Mon, 16 Mar 2015 10:05:16 +0000 (+0200) Subject: Merge branch 'master' into newmc X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=5b01a19d266d33b2d0bfcd01ae3a924f4a742ec4;hp=-c;p=plack-app-gruntmaster.git Merge branch 'master' into newmc Conflicts: tmpl/skel.en --- 5b01a19d266d33b2d0bfcd01ae3a924f4a742ec4 diff --combined tmpl/skel.en index 26d074e,39b4dda..f7da708 --- a/tmpl/skel.en +++ b/tmpl/skel.en @@@ -3,22 -3,21 +3,22 @@@ - - - - + + + +
+

TITLE

Content goes here
- + +
Themes: @@@ -59,34 -56,8 +59,34 @@@ Tracking +

Official sponsors

+ + + + + + + +
+