Merge branch 'netflux' into beta

This commit is contained in:
ansuz committed 2016-04-14 12:37:28 +02:00
commit 5a5b9ad718
524 files changed
+46146 -8153

No files matched your search

+1 -1
View File
@@ -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,