diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2019-05-04 13:59:27 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2019-05-04 13:59:27 +0000 |
| commit | 8e1c5841e98094c9801f3dc378195af9e3541493 (patch) | |
| tree | c086fb400f7ac7ad6d693ee3d04684e9dc44150b /src/App.vue | |
| parent | 0438031da44a70816716de40625541d569a49c85 (diff) | |
| parent | 9787d996722e44e6554d936e0995bf4c346207e2 (diff) | |
Merge branch '441-reporting' into 'develop'
Reporting
Closes #441
See merge request pleroma/pleroma-fe!695
Diffstat (limited to 'src/App.vue')
| -rw-r--r-- | src/App.vue | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/App.vue b/src/App.vue index 3b8623ad..cb7e8d78 100644 --- a/src/App.vue +++ b/src/App.vue @@ -46,6 +46,7 @@ <media-modal></media-modal> </div> <chat-panel :floating="true" v-if="currentUser && chat" class="floating-chat mobile-hidden"></chat-panel> + <UserReportingModal /> </div> </template> |