aboutsummaryrefslogtreecommitdiff
path: root/src/main.js
diff options
context:
space:
mode:
authorHJ <30-hj@users.noreply.git.pleroma.social>2019-05-04 13:59:27 +0000
committerHJ <30-hj@users.noreply.git.pleroma.social>2019-05-04 13:59:27 +0000
commit8e1c5841e98094c9801f3dc378195af9e3541493 (patch)
treec086fb400f7ac7ad6d693ee3d04684e9dc44150b /src/main.js
parent0438031da44a70816716de40625541d569a49c85 (diff)
parent9787d996722e44e6554d936e0995bf4c346207e2 (diff)
Merge branch '441-reporting' into 'develop'
Reporting Closes #441 See merge request pleroma/pleroma-fe!695
Diffstat (limited to 'src/main.js')
-rw-r--r--src/main.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main.js b/src/main.js
index 725f5806..92f843b1 100644
--- a/src/main.js
+++ b/src/main.js
@@ -12,6 +12,7 @@ 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 reportsModule from './modules/reports.js'
import VueTimeago from 'vue-timeago'
import VueI18n from 'vue-i18n'
@@ -75,7 +76,8 @@ const persistedStateOptions = {
chat: chatModule,
oauth: oauthModule,
mediaViewer: mediaViewerModule,
- oauthTokens: oauthTokensModule
+ oauthTokens: oauthTokensModule,
+ reports: reportsModule
},
plugins: [persistedState, pushNotifications],
strict: false // Socket modifies itself, let's ignore this for now.