merge develop, fix conflicts, fix logged out bug
This commit is contained in:
commit
16c7bd0199
19 changed files with 61 additions and 65 deletions
|
@ -20,7 +20,7 @@ const Notification = {
|
|||
this.userExpanded = !this.userExpanded
|
||||
},
|
||||
userProfileLink (user) {
|
||||
return generateProfileLink(user.id, user.screen_name)
|
||||
return generateProfileLink(user.id, user.screen_name, this.$store.state.instance.restrictedNicknames)
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue