Merge branch 'develop' into 'fix/use-semantically-correct-buttons'

# Conflicts: # CHANGELOG.md
2020-12-01 10:47:10 +00:00 · 2020-12-01 10:47:10 +00:00 · 655d985a82
commit 655d985a82
parent 276ef31145 133294dc2a
16 changed files with 5794 additions and 1081 deletions
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@ -159,8 +159,7 @@ const PostStatusForm = {
          ...this.$store.state.instance.emoji,
          ...this.$store.state.instance.customEmoji
        ],
-        users: this.$store.state.users.users,
-        updateUsersList: (query) => this.$store.dispatch('searchUsers', { query })
+        store: this.$store
      })
    },
    emojiSuggestor () {