diff options
| author | Shpuld Shpludson <shp@cock.li> | 2019-02-28 17:03:11 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2019-02-28 17:03:11 +0000 |
| commit | efc4fa1099024e0451fd7e0d271bd0a4a25aff5a (patch) | |
| tree | e0db0a23fcf7119b16b7679c840efbed845ae9ec /src/main.js | |
| parent | 058238c3c631520d052327fcab47c997dfe23151 (diff) | |
| parent | 267952b4e7e2bdb2b160cbe3a49f4f6dd23972b5 (diff) | |
Merge branch 'feature/oauth-tokens-in-settings' into 'develop'
Add OAuth Tokens management to settings
See merge request pleroma/pleroma-fe!572
Diffstat (limited to 'src/main.js')
| -rw-r--r-- | src/main.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main.js b/src/main.js index adeb0550..2844194e 100644 --- a/src/main.js +++ b/src/main.js @@ -11,6 +11,7 @@ import configModule from './modules/config.js' import chatModule from './modules/chat.js' import oauthModule from './modules/oauth.js' import mediaViewerModule from './modules/media_viewer.js' +import oauthTokensModule from './modules/oauth_tokens.js' import VueTimeago from 'vue-timeago' import VueI18n from 'vue-i18n' @@ -64,7 +65,8 @@ createPersistedState(persistedStateOptions).then((persistedState) => { config: configModule, chat: chatModule, oauth: oauthModule, - mediaViewer: mediaViewerModule + mediaViewer: mediaViewerModule, + oauthTokens: oauthTokensModule }, plugins: [persistedState, pushNotifications], strict: false // Socket modifies itself, let's ignore this for now. |
