Merge branch 'restore-routes' into 'develop'

Restore old routes, enable user route as fallback.

See merge request pleroma/pleroma-fe!440
This commit is contained in:
lambda 2018-12-29 13:27:59 +00:00
commit 1555a5fef3
18 changed files with 58 additions and 62 deletions

View file

@ -180,7 +180,7 @@ export default {
}
},
userProfileLink (user) {
return generateProfileLink(user.id, user.screen_name)
return generateProfileLink(user.id, user.screen_name, this.$store.state.instance.restrictedNicknames)
}
}
}