Merge branch 'develop' into 'feat/conversation-muting'

# Conflicts: # src/services/api/api.service.js
2019-07-15 19:09:01 +00:00 · 2019-07-15 19:09:01 +00:00 · 3370dd80dc
commit 3370dd80dc
parent 7ed9d17ce7 e9b452575b
45 changed files with 717 additions and 387 deletions
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@ -68,6 +68,7 @@ export const parseUser = (data) => {
        output.following = relationship.following
        output.statusnet_blocking = relationship.blocking
        output.muted = relationship.muting
+        output.subscribed = relationship.subscribing
      }

      output.hide_follows = data.pleroma.hide_follows