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

@ -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: {