Merge branch 'master' into newmc
authorMarius Gavrilescu <marius@ieval.ro>
Mon, 16 Mar 2015 10:05:16 +0000 (12:05 +0200)
committerMarius Gavrilescu <marius@ieval.ro>
Mon, 16 Mar 2015 10:05:16 +0000 (12:05 +0200)
Conflicts:
tmpl/skel.en

1  2 
tmpl/skel.en

diff --cc tmpl/skel.en
index 26d074ebc4dd116a7f811941cb380779c5285db5,39b4ddae50435374e95c80aea92ae7e187a0b776..f7da70887cda5437f23244ef783e7361afc9ace4
@@@ -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:
This page took 0.011351 seconds and 4 git commands to generate.