diff options
| author | shpuld <shp@cock.li> | 2018-12-29 16:25:45 +0200 |
|---|---|---|
| committer | shpuld <shp@cock.li> | 2018-12-29 16:25:45 +0200 |
| commit | 16c7bd0199717e705697ddcce100cc2141eb0afc (patch) | |
| tree | f96ed970d6106a4be664201424f859dcce891f33 /src/modules/instance.js | |
| parent | 747e4090cabfda353e76c9a45def70bef8c297e5 (diff) | |
| parent | 1555a5fef38dced753c418d736468712ea818975 (diff) | |
merge develop, fix conflicts, fix logged out bug
Diffstat (limited to 'src/modules/instance.js')
| -rw-r--r-- | src/modules/instance.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/modules/instance.js b/src/modules/instance.js index 546d2cc4..4ad41873 100644 --- a/src/modules/instance.js +++ b/src/modules/instance.js @@ -12,8 +12,8 @@ const defaultState = { logo: '/static/logo.png', logoMask: true, logoMargin: '.2em', - redirectRootNoLogin: '/~/main/all', - redirectRootLogin: '/~/main/friends', + redirectRootNoLogin: '/main/all', + redirectRootLogin: '/main/friends', showInstanceSpecificPanel: false, scopeOptionsEnabled: true, formattingOptionsEnabled: false, @@ -33,6 +33,7 @@ const defaultState = { pleromaBackend: true, emoji: [], customEmoji: [], + restrictedNicknames: [], // Feature-set, apparently, not everything here is reported... mediaProxyAvailable: false, |