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