From: Marius Gavrilescu <marius@ieval.ro>
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;h=3e09c768b3e7c39806494d2cc6e24b845ff108f3;p=gruntmaster-page.git

Merge branch 'master' into newmc

Conflicts:
	tmpl/skel.en
---

3e09c768b3e7c39806494d2cc6e24b845ff108f3
diff --cc tmpl/skel.en
index 19377d9,956e895..792da5a
--- a/tmpl/skel.en
+++ b/tmpl/skel.en
@@@ -16,7 -16,7 +16,8 @@@
  <li id="nav-log"><a href="/log/">Job log</a>
  <li id="nav-us"><a href="/us/">Users</a>
  <li id="nav-account"><a href="/account">Account</a>
 +<li id="nav-about"><a href="/about">About / Help</a>
+ <li id="nav-contribute"><a href="/contribute">Contribute!</a>
  <li id="theme-selector" class="reqjs"><a class="dropdown-toggle" data-toggle="dropdown"> Theme <span class="caret"></span></a>
  <ul class="dropdown-menu" role="menu">
  <li><a href="#" id="theme_slate">Gunmetal gray</a>