diff options
| author | shpuld <shp@cock.li> | 2018-12-29 16:25:45 +0200 |
|---|---|---|
| committer | shpuld <shp@cock.li> | 2018-12-29 16:25:45 +0200 |
| commit | 16c7bd0199717e705697ddcce100cc2141eb0afc (patch) | |
| tree | f96ed970d6106a4be664201424f859dcce891f33 /src/components/user_card/user_card.js | |
| parent | 747e4090cabfda353e76c9a45def70bef8c297e5 (diff) | |
| parent | 1555a5fef38dced753c418d736468712ea818975 (diff) | |
merge develop, fix conflicts, fix logged out bug
Diffstat (limited to 'src/components/user_card/user_card.js')
| -rw-r--r-- | src/components/user_card/user_card.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/components/user_card/user_card.js b/src/components/user_card/user_card.js index f0fff335..615e6487 100644 --- a/src/components/user_card/user_card.js +++ b/src/components/user_card/user_card.js @@ -33,7 +33,7 @@ const UserCard = { this.$store.dispatch('removeFollowRequest', this.user) }, userProfileLink (user) { - return generateProfileLink(user.id, user.screen_name) + return generateProfileLink(user.id, user.screen_name, this.$store.state.instance.restrictedNicknames) } } } |
