merge develop and fix conflicts AGAIN

This commit is contained in:
shpuld 2019-02-04 19:49:23 +02:00
commit 54e7e0e31b
26 changed files with 145 additions and 140 deletions

View file

@ -100,8 +100,7 @@ export const parseUser = (data) => {
output.rights = data.rights
output.no_rich_text = data.no_rich_text
output.default_scope = data.default_scope
output.hide_followings = data.hide_followings
output.hide_followers = data.hide_followers
output.hide_network = data.hide_network
output.background_image = data.background_image
// on mastoapi this info is contained in a "relationship"
output.following = data.following