Merge branch 'develop' into feature/normal-emoji-completion

2017-12-23 19:52:16 +02:00 · 2017-12-23 19:52:16 +02:00 · b67c506062
commit b67c506062
parent 581e3e836a 6fd309452a
36 changed files with 457 additions and 196 deletions
--- a/static/config.json
+++ b/static/config.json
@ -3,5 +3,7 @@
  "theme": "pleroma-dark",
  "background": "/static/bg.jpg",
  "logo": "/static/logo.png",
-  "registrationOpen": false
+  "registrationOpen": false,
+  "defaultPath": "/main/all",
+  "chatDisabled": false
 }