diff options
| author | Marcel Klehr <mklehr@gmx.net> | 2012-08-02 09:00:04 +0200 |
|---|---|---|
| committer | Marcel Klehr <mklehr@gmx.net> | 2012-08-02 09:00:04 +0200 |
| commit | aa986ab9544f01d0ac1611b97ab8be73c32c5992 (patch) | |
| tree | 624f401de1290d1b2941576c1d7d76cf67454c2d /src | |
| parent | db54ab4b36fcaa77341b43c29e513ee3c738924c (diff) | |
| parent | 2fd604973c71b95e1716ec48cb49cace821af663 (diff) | |
| download | etherpad-lite-aa986ab9544f01d0ac1611b97ab8be73c32c5992.zip | |
Merge branch 'fix/editorloadingbox' into develop
Diffstat (limited to 'src')
| -rw-r--r-- | src/templates/pad.html | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/templates/pad.html b/src/templates/pad.html index 35f8897a..586f6d79 100644 --- a/src/templates/pad.html +++ b/src/templates/pad.html @@ -298,11 +298,6 @@ </div> <% e.end_block(); %> </div> - - <div id="editorcontainerbox"> - <div id="editorcontainer"></div> - <div id="editorloadingbox">Loading...</div> - </div> <div id="chatthrob"></div> |