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/App.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/App.js')
| -rw-r--r-- | src/App.js | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -8,9 +8,10 @@ import WhoToFollowPanel from './components/who_to_follow_panel/who_to_follow_pan import ChatPanel from './components/chat_panel/chat_panel.vue' 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 MobilePostStatusButton from './components/mobile_post_status_button/mobile_post_status_button.vue' import MobileNav from './components/mobile_nav/mobile_nav.vue' import UserReportingModal from './components/user_reporting_modal/user_reporting_modal.vue' +import PostStatusModal from './components/post_status_modal/post_status_modal.vue' import { windowWidth } from './services/window_utils/window_utils' export default { @@ -26,9 +27,10 @@ export default { ChatPanel, MediaModal, SideDrawer, - MobilePostStatusModal, + MobilePostStatusButton, MobileNav, - UserReportingModal + UserReportingModal, + PostStatusModal }, data: () => ({ mobileActivePanel: 'timeline', |
