diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2019-06-17 20:17:58 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2019-06-17 20:17:58 +0000 |
| commit | ac46de3972851e12373f690d3ef70f31cc7db1ef (patch) | |
| tree | eda83032a5d3824d1a8d8cffcfa3834ad9c17460 /static | |
| parent | 8d2e63a8e4b51deb7efb1d4fbbd5e20dfb924e73 (diff) | |
| parent | 22a33512087710e9ca6c898c2c8b4592ac73e32d (diff) | |
Merge branch 'mastoapi-login-and-config-fixes' into 'develop'
Mastoapi login and config fixes
See merge request pleroma/pleroma-fe!833
Diffstat (limited to 'static')
| -rw-r--r-- | static/config.json | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/static/config.json b/static/config.json index 04cbb97b..5cdb33a0 100644 --- a/static/config.json +++ b/static/config.json @@ -8,7 +8,6 @@ "redirectRootLogin": "/main/friends", "chatDisabled": false, "showInstanceSpecificPanel": false, - "formattingOptionsEnabled": false, "collapseMessageWithSubject": false, "scopeCopy": true, "subjectLineBehavior": "email", |