diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2020-06-06 20:31:43 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2020-06-06 20:31:43 +0000 |
| commit | e47d0f210317c6e04e15fb89eb8f1d469137b779 (patch) | |
| tree | 690ea8df1bb58e08ae9ee0f0e87abd1d92c91a7f /src/components/notification/notification.js | |
| parent | 0a3069aec0c6b664381d202bca5a8460a1d6d9fc (diff) | |
| parent | 7d695fc8f285357393a669d776a1fa1313b0b16d (diff) | |
Merge branch 'fix-reprooted-muted-posts' into 'develop'
Fixed some issues with muting
See merge request pleroma/pleroma-fe!1120
Diffstat (limited to 'src/components/notification/notification.js')
| -rw-r--r-- | src/components/notification/notification.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/components/notification/notification.js b/src/components/notification/notification.js index 1cf4c9bc..5aa40e98 100644 --- a/src/components/notification/notification.js +++ b/src/components/notification/notification.js @@ -1,3 +1,4 @@ +import StatusContent from '../status_content/status_content.vue' import Status from '../status/status.vue' import UserAvatar from '../user_avatar/user_avatar.vue' import UserCard from '../user_card/user_card.vue' @@ -16,10 +17,11 @@ const Notification = { }, props: [ 'notification' ], components: { - Status, + StatusContent, UserAvatar, UserCard, - Timeago + Timeago, + Status }, methods: { toggleUserExpanded () { |