Merge branch 'develop' into admin-index-plugable

This commit is contained in:
Swen 2013-01-30 20:16:51 +01:00
commit 1f348d911f
22 changed files with 1595 additions and 105 deletions

View file

@ -365,8 +365,6 @@
<% e.end_block(); %>
</div>
<div id="chatthrob"></div>
<div id="chaticon" onclick="chat.show();return false;">
<span id="chatlabel" data-l10n-id="pad.chat"></span>
<span class="buttonicon buttonicon-chat"></span>