Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

2018-03-07 17:49:57 +01:00
parent 4262c8e6e4 7a70d69d8e
commit 71f519f982
10 changed files with 23 additions and 13 deletions
--- a/customize.dist/translations/messages.js
+++ b/customize.dist/translations/messages.js
@@ -48,7 +48,7 @@ define(function () {

    out.disconnected = 'Disconnected';
    out.synchronizing = 'Synchronizing';
-    out.reconnecting = 'Reconnecting...';
+    out.reconnecting = 'Reconnecting';
    out.typing = "Editing";
    out.initializing = "Initializing...";
    out.forgotten = 'Moved to the trash';