merge develop and fix conflicts AGAIN

src/services/api/api.service.js

@@ -130,7 +130,7 @@ const updateBanner = ({credentials, params}) => {
 // description
 const updateProfile = ({credentials, params}) => {
   // Always include these fields, because they might be empty or false
-  const fields = ['description', 'locked', 'no_rich_text', 'hide_followings', 'hide_followers']
+  const fields = ['description', 'locked', 'no_rich_text', 'hide_network']
   let url = PROFILE_UPDATE_URL
 
   const form = new FormData()

src/services/entity_normalizer/entity_normalizer.service.js

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