Merge branch 'feature/dynamicConfig' into develop

musiqpad · Jul 10, 2016 · 6635b44 · 6635b44
2 parents a6160f8 + d9e2bb4
commit 6635b44
Show file tree

Hide file tree

Showing 19 changed files with 1,453 additions and 854 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -7,7 +7,8 @@
     "no-param-reassign": 0,
     "no-shadow": 0,
     "consistent-return": 0,
-    "func-names": 0
+    "func-names": 0,
+    "indent": 0
   },
   "env": {
     "browser": true,

diff --git a/.gitignore b/.gitignore
@@ -12,6 +12,7 @@ webconfig.js
 webserver/public/lib/js/webconfig.js
 pidfile
 log.txt
+config.hjson
 
 # IDE files
 .idea