From: Marius Gavrilescu Date: Mon, 9 Feb 2015 21:02:43 +0000 (+0200) Subject: Merge branch 'master' into newmc X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;ds=sidebyside;h=3e09c768b3e7c39806494d2cc6e24b845ff108f3;hp=-c;p=gruntmaster-page.git Merge branch 'master' into newmc Conflicts: tmpl/skel.en --- 3e09c768b3e7c39806494d2cc6e24b845ff108f3 diff --combined js/90-nav.js index 92a9d43,fc91ff1..743595a --- a/js/90-nav.js +++ b/js/90-nav.js @@@ -3,11 -3,12 +3,12 @@@ var NAVS = { 'home': /^\/$/, - 'pb': /^\/(?:pb|sol)\//, - 'ct': /^\/(?:ct|st|ed)\//, + 'pb': /^\/pb\//, + 'ct': /^\/(?:ct|st)\//, 'log': /^\/log\//, 'us': /^\/us\//, 'account': /^\/account$/, + 'contribute': /^\/contribute$/, }; $( document ).ready(function(){ diff --combined tmpl/skel.en index 19377d9,956e895..792da5a --- a/tmpl/skel.en +++ b/tmpl/skel.en @@@ -3,20 -3,20 +3,21 @@@ - +
- +

TITLE

Content goes here
+

Track user

@@@ -61,31 -60,8 +62,31 @@@ Tracking +

Official sponsors

+ + + + +
+