merge develop, fix conflicts, fix logged out bug

This commit is contained in:
shpuld 2018-12-29 16:25:45 +02:00
commit 16c7bd0199
19 changed files with 61 additions and 65 deletions

View file

@ -23,7 +23,7 @@ const chatPanel = {
this.collapsed = !this.collapsed
},
userProfileLink (user) {
return generateProfileLink(user.id, user.username)
return generateProfileLink(user.id, user.username, this.$store.state.instance.restrictedNicknames)
}
}
}