diff options
| author | Swen <swen.jung@psx-technology.com> | 2013-01-30 20:16:51 +0100 |
|---|---|---|
| committer | Swen <swen.jung@psx-technology.com> | 2013-01-30 20:16:51 +0100 |
| commit | 1f348d911f03403f91bafb66a7da4b5ca577647f (patch) | |
| tree | 226dd8e424ded3d217e1e0bba9000f794d094d96 /src/templates | |
| parent | 80333d8e0a60017b5625ac885ff66a41d5ef01b8 (diff) | |
| parent | 621a410750bf271c840b5a9ab411b860de10e130 (diff) | |
| download | etherpad-lite-1f348d911f03403f91bafb66a7da4b5ca577647f.zip | |
Merge branch 'develop' into admin-index-plugable
Diffstat (limited to 'src/templates')
| -rw-r--r-- | src/templates/pad.html | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/templates/pad.html b/src/templates/pad.html index cb88c1c1..76df5133 100644 --- a/src/templates/pad.html +++ b/src/templates/pad.html @@ -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> |