Merge branch 'new-messaging' into staging

2017-08-25 14:42:34 +02:00
parent 9e04d039d7 22d754d514
commit 57d0c6c973
13 changed files with 1449 additions and 10 deletions
--- a/customize.dist/pages.js
+++ b/customize.dist/pages.js
@@ -657,6 +657,10 @@ define([
        return loadingScreen();
    };

+    Pages['/contacts2/'] = Pages['/contacts2/index.html'] = function () {
+        return loadingScreen();
+    };
+
    Pages['/pad/'] = Pages['/pad/index.html'] = function () {
        return loadingScreen();
    };