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

2017-07-10 11:46:16 +02:00
parent ff10c282d4 e10de1219b
commit 8e2e8b1653
2 changed files with 10 additions and 1 deletions
--- a/customize.dist/messages.js
+++ b/customize.dist/messages.js
@@ -46,6 +46,7 @@ define(req, function($, Default, Language) {
    }

    messages._languages = map;
+    messages._languageUsed = language;

    messages._checkTranslationState = function (cb) {
        if (typeof(cb) !== "function") { return; }