Merge branch 'beta' into netflux

2016-04-25 16:08:00 +02:00
parent 85d5f5c47f f9de1c9e1f
commit 255dc17a5d
6 changed files with 243 additions and 57 deletions
--- a/www/pad/main.js
+++ b/www/pad/main.js
@@ -269,7 +269,7 @@ define([
                  hjson.pop();
                }
                return hjson;
-            }
+            };

            var onRemote = realtimeOptions.onRemote = function (info) {
                if (initializing) { return; }