Merge branch 'master' into 257-remove-old-api

2015-03-30 11:57:03 +02:00
parent d0313a4228 a664a1c550
commit b2d9e5e822
6 changed files with 67 additions and 1 deletions
@@ -152,6 +152,7 @@ var config = {
      x: 0,
      y: 0
    }
+    ,disabled_file: 'pids/disabled'

    // Use this as a feature flags enabling/disabling mechanism
    ,enabledFeatures: {