Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into develop

static/config.json

@@ -1,23 +1,28 @@
 {
-  "theme": "ihatebeingalive",
-  "background": "/static/aurora_borealis.jpg",
-  "logo": "/static/logo.png",
-  "logoMask": true,
-  "logoMargin": ".1em",
-  "redirectRootNoLogin": "/main/all",
-  "redirectRootLogin": "/main/friends",
-  "showInstanceSpecificPanel": false,
-  "collapseMessageWithSubject": false,
-  "scopeCopy": true,
-  "subjectLineBehavior": "email",
-  "postContentType": "text/plain",
   "alwaysShowSubjectInput": true,
+  "background": "/static/aurora_borealis.jpg",
+  "collapseMessageWithSubject": false,
+  "disableChat": false,
+  "greentext": false,
+  "hideFilteredStatuses": false,
+  "hideMutedPosts": false,
   "hidePostStats": false,
+  "hideSitename": false,
   "hideUserStats": false,
   "loginMethod": "password",
-  "webPushNotifications": false,
-  "noAttachmentLinks": false,
+  "logo": "/static/logo.png",
+  "logoMargin": ".1em",
+  "logoMask": true,
+  "minimalScopesMode": false,
   "nsfwCensorImage": "",
+  "postContentType": "text/plain",
+  "redirectRootLogin": "/main/friends",
+  "redirectRootNoLogin": "/main/all",
+  "scopeCopy": true,
   "showFeaturesPanel": true,
-  "minimalScopesMode": false
+  "showInstanceSpecificPanel": false,
+  "sidebarRight": false,
+  "subjectLineBehavior": "email",
+  "theme": "ihatebeingalive",
+  "webPushNotifications": false
 }