diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2019-03-25 19:09:22 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2019-03-25 19:09:22 +0000 |
| commit | 3025532ecf6b728604d14af9bf218e96de0756ed (patch) | |
| tree | 6ae4a91f593357bbbcae3109002dbd22122e1d02 /src/App.vue | |
| parent | 8522063b2c4a35f0926517a3b75376c81131dd79 (diff) | |
| parent | 854d0e80512d2da80cd5153144698a5148da4aa6 (diff) | |
Merge branch 'develop' into 'mastoapi/public-tl'
# Conflicts:
# src/services/api/api.service.js
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 acbbeb75..4fff3d1d 100644 --- a/src/App.vue +++ b/src/App.vue @@ -50,6 +50,7 @@ <media-modal></media-modal> </div> <chat-panel :floating="true" v-if="currentUser && chat" class="floating-chat mobile-hidden"></chat-panel> + <MobilePostStatusModal /> </div> </template> |