diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2022-03-16 17:33:24 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2022-03-16 17:33:24 +0000 |
| commit | b632d740c13ff4e5c98a7a101f26ca60cd2629bb (patch) | |
| tree | 7f14c26115de5100cc7e1a9523f038951b043183 /src/main.js | |
| parent | 186078ae2a330be82d5a3928b37525a7fd52cb12 (diff) | |
| parent | 123de8aad01333cc18fb5129dc82756070175fe1 (diff) | |
Merge branch 'expert-settings-and-serverside' into 'develop'
Expert settings and serverside settings + new defaults
See merge request pleroma/pleroma-fe!1438
Diffstat (limited to 'src/main.js')
| -rw-r--r-- | src/main.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/main.js b/src/main.js index 03493525..bdf8368b 100644 --- a/src/main.js +++ b/src/main.js @@ -11,6 +11,7 @@ import statusesModule from './modules/statuses.js' import usersModule from './modules/users.js' import apiModule from './modules/api.js' import configModule from './modules/config.js' +import serverSideConfigModule from './modules/serverSideConfig.js' import shoutModule from './modules/shout.js' import oauthModule from './modules/oauth.js' import authFlowModule from './modules/auth_flow.js' @@ -90,6 +91,7 @@ const persistedStateOptions = { users: usersModule, api: apiModule, config: configModule, + serverSideConfig: serverSideConfigModule, shout: shoutModule, oauth: oauthModule, authFlow: authFlowModule, |