aboutsummaryrefslogtreecommitdiff
path: root/src/components/user_profile/user_profile.js
diff options
context:
space:
mode:
authorShpuld Shpludson <shp@cock.li>2019-04-08 19:01:40 +0000
committerShpuld Shpludson <shp@cock.li>2019-04-08 19:01:40 +0000
commit546ced43d9edbaf176f71b010aadc11bf7e5e851 (patch)
treeb198a3b47ecea40df33b072ff5576583ab722f22 /src/components/user_profile/user_profile.js
parent2f725c570b5567eb6d92f056f723b193529e3ffd (diff)
parent6b6878bde06b375b1e715a3557f153acc73a8af0 (diff)
Merge branch 'moderation-menu' into 'develop'
Moderation menu #310 See merge request pleroma/pleroma-fe!595
Diffstat (limited to 'src/components/user_profile/user_profile.js')
-rw-r--r--src/components/user_profile/user_profile.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/components/user_profile/user_profile.js b/src/components/user_profile/user_profile.js
index 1df06fe6..540de955 100644
--- a/src/components/user_profile/user_profile.js
+++ b/src/components/user_profile/user_profile.js
@@ -3,6 +3,7 @@ import get from 'lodash/get'
import UserCard from '../user_card/user_card.vue'
import FollowCard from '../follow_card/follow_card.vue'
import Timeline from '../timeline/timeline.vue'
+import ModerationTools from '../moderation_tools/moderation_tools.vue'
import withLoadMore from '../../hocs/with_load_more/with_load_more'
import withList from '../../hocs/with_list/with_list'
@@ -155,7 +156,8 @@ const UserProfile = {
UserCard,
Timeline,
FollowerList,
- FriendList
+ FriendList,
+ ModerationTools
}
}