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

Merge branch 'master' into newmc

Conflicts:
	tmpl/skel.en
---

5b01a19d266d33b2d0bfcd01ae3a924f4a742ec4
diff --cc tmpl/skel.en
index 26d074e,39b4dda..f7da708
--- a/tmpl/skel.en
+++ b/tmpl/skel.en
@@@ -33,8 -31,7 +33,8 @@@
  
  <div id="content">Content goes here</div>
  
- <div id="login" class="reqjs"><a href="/login">Log in</a></div>
+ <div id="login" class="reqjs"><a href="#">Log in</a></div>
 +<div id="webchat"><a href="http://webchat.oftc.net/?channels=%23mindcoding" target="_blank">Webchat</a></div>
  
  <div id="theme-selector" class="reqjs">
  Themes: