aboutsummaryrefslogtreecommitdiff
path: root/src/App.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/App.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/App.js')
-rw-r--r--src/App.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/App.js b/src/App.js
index 46145b16..e72c73e3 100644
--- a/src/App.js
+++ b/src/App.js
@@ -10,6 +10,7 @@ import MediaModal from './components/media_modal/media_modal.vue'
import SideDrawer from './components/side_drawer/side_drawer.vue'
import MobilePostStatusModal from './components/mobile_post_status_modal/mobile_post_status_modal.vue'
import MobileNav from './components/mobile_nav/mobile_nav.vue'
+import UserReportingModal from './components/user_reporting_modal/user_reporting_modal.vue'
import { windowWidth } from './services/window_utils/window_utils'
export default {
@@ -26,7 +27,8 @@ export default {
MediaModal,
SideDrawer,
MobilePostStatusModal,
- MobileNav
+ MobileNav,
+ UserReportingModal
},
data: () => ({
mobileActivePanel: 'timeline',