diff options
| author | Shpuld Shpludson <shp@cock.li> | 2019-09-25 06:41:26 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2019-09-25 06:41:26 +0000 |
| commit | ccba92a27cc96d6db9b28d456f6fff6cb6804a52 (patch) | |
| tree | 8feebac1047612171e06eeb7093f1fb600b22665 /src/main.js | |
| parent | 61bb02ef0631b534e1a80a3b08f0e27c1a1c8e66 (diff) | |
| parent | c8a18f387c28d5f895c1e727b0d040da96dcebc1 (diff) | |
Merge branch '639-2' into 'develop'
Add "Mention user" button to user card
Closes #639
See merge request pleroma/pleroma-fe!955
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 b3256e8e..a43d31e2 100644 --- a/src/main.js +++ b/src/main.js @@ -15,6 +15,7 @@ import mediaViewerModule from './modules/media_viewer.js' import oauthTokensModule from './modules/oauth_tokens.js' import reportsModule from './modules/reports.js' import pollsModule from './modules/polls.js' +import postStatusModule from './modules/postStatus.js' import VueI18n from 'vue-i18n' @@ -76,7 +77,8 @@ const persistedStateOptions = { mediaViewer: mediaViewerModule, oauthTokens: oauthTokensModule, reports: reportsModule, - polls: pollsModule + polls: pollsModule, + postStatus: postStatusModule }, plugins: [persistedState, pushNotifications], strict: false // Socket modifies itself, let's ignore this for now. |