Merge branch 'msg' into staging

2017-07-10 11:48:22 +02:00
parent 8e2e8b1653 1c531ccd47
commit 159d72f33b
27 changed files with 1341 additions and 21 deletions
--- a/customize.dist/pages.js
+++ b/customize.dist/pages.js
@@ -489,6 +489,10 @@ define([
        return loadingScreen();
    };

+    Pages['/friends/'] = Pages['/friends/index.html'] = function () {
+        return loadingScreen();
+    };
+
    Pages['/pad/'] = Pages['/pad/index.html'] = function () {
        return loadingScreen();
    };
@@ -501,5 +505,9 @@ define([
        return loadingScreen();
    };

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