Merge branch 'netflux' into beta

2016-04-14 12:37:28 +02:00
parent 4af987a2a2 feaae609ad
commit 5a5b9ad718
524 changed files with 46146 additions and 8153 deletions
--- a/www/p/main.js
+++ b/www/p/main.js
@@ -189,7 +189,7 @@ define([
                // reject patch if it results in invalid JSON
                transformFunction : JsonOT.validate,

-                websocketURL: Config.websocketURL,
+                websocketURL: Config.websocketURL+'_old',

                // username
                userName: userName,