mirror of
https://github.com/ether/etherpad-lite.git
synced 2025-04-25 18:06:15 -04:00
Merge branch 'develop' into admin-index-plugable
This commit is contained in:
commit
1f348d911f
22 changed files with 1595 additions and 105 deletions
|
@ -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>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue