From: Marius Gavrilescu <marius@ieval.ro>
Date: Fri, 6 Feb 2015 15:21:28 +0000 (+0200)
Subject: Merge branch 'master' into newmc
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=5251db546cbc5eb678a007cfee54d170ad29ff45;p=gruntmaster-page.git

Merge branch 'master' into newmc

Conflicts:
	tmpl/skel.en
---

5251db546cbc5eb678a007cfee54d170ad29ff45
diff --cc tmpl/skel.en
index 0fc3aa4,fce6bd8..8c6460c
--- a/tmpl/skel.en
+++ b/tmpl/skel.en
@@@ -37,10 -36,9 +37,10 @@@
  <div id="content">Content goes here</div>
  
  <div id="login" class="hidden"><a href="/login">Log in</a></div>
 +<div id="webchat"><a href="http://webchat.oftc.net/?channels=%23mindcoding" target="_blank">Webchat</a></div>
  
  <div id="tracker" class="hidden">
- <h1>Track user</h1>
+ <h3>Track user</h3>
  <div id="tracker_form">
  <div class="form-group">
  <label for="tracker_username">Username</label>