diff options
| author | Shpuld Shpludson <shp@cock.li> | 2019-03-28 20:08:40 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2019-03-28 20:08:40 +0000 |
| commit | 7e8c2acc981b6d4f55e0fd898f1769a82658d49a (patch) | |
| tree | 074323e3ec8c8cea427780f6c7a095dc032e0d6f /src/components/timeline/timeline.js | |
| parent | e2e3a65c44c1bd73d3d727333e6163e9b0d07653 (diff) | |
| parent | a39fc49e848c1444f76a7528eac4a7733199b336 (diff) | |
Merge branch 'issue-433-status-reply-form' into 'develop'
Issue 433 status reply form
Closes #433
See merge request pleroma/pleroma-fe!674
Diffstat (limited to 'src/components/timeline/timeline.js')
| -rw-r--r-- | src/components/timeline/timeline.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js index c45f8947..1da7d5cc 100644 --- a/src/components/timeline/timeline.js +++ b/src/components/timeline/timeline.js @@ -1,6 +1,6 @@ import Status from '../status/status.vue' import timelineFetcher from '../../services/timeline_fetcher/timeline_fetcher.service.js' -import StatusOrConversation from '../status_or_conversation/status_or_conversation.vue' +import Conversation from '../conversation/conversation.vue' import { throttle } from 'lodash' const Timeline = { @@ -43,7 +43,7 @@ const Timeline = { }, components: { Status, - StatusOrConversation + Conversation }, created () { const store = this.$store |