diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2020-02-11 23:09:15 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2020-02-11 23:09:15 +0000 |
| commit | 84ebae8ed36390f62ccda653d4fb9d8aad1482a2 (patch) | |
| tree | 70fb486e4b31b029c8dbcb89f87acf154275f905 /src/components/user_settings/user_settings.js | |
| parent | 60446c56a5c8d4b4d669fbd4803e77ce686daac9 (diff) | |
| parent | 96dc297babd5797b9307af8676719c2eb8cd80e2 (diff) | |
Merge branch 'develop' into 'themes-accent'
# Conflicts:
# src/components/emoji_reactions/emoji_reactions.vue
Diffstat (limited to 'src/components/user_settings/user_settings.js')
| -rw-r--r-- | src/components/user_settings/user_settings.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/components/user_settings/user_settings.js b/src/components/user_settings/user_settings.js index 38373056..eca6f9b1 100644 --- a/src/components/user_settings/user_settings.js +++ b/src/components/user_settings/user_settings.js @@ -55,6 +55,7 @@ const UserSettings = { showRole: this.$store.state.users.currentUser.show_role, role: this.$store.state.users.currentUser.role, discoverable: this.$store.state.users.currentUser.discoverable, + allowFollowingMove: this.$store.state.users.currentUser.allow_following_move, pickAvatarBtnVisible: true, bannerUploading: false, backgroundUploading: false, @@ -162,6 +163,7 @@ const UserSettings = { hide_follows: this.hideFollows, hide_followers: this.hideFollowers, discoverable: this.discoverable, + allow_following_move: this.allowFollowingMove, hide_follows_count: this.hideFollowsCount, hide_followers_count: this.hideFollowersCount, show_role: this.showRole |