Merge branch 'develop' into 'themes-accent'

# Conflicts: # src/components/emoji_reactions/emoji_reactions.vue
2020-02-11 23:09:15 +00:00 · 2020-02-11 23:09:15 +00:00 · 84ebae8ed3
commit 84ebae8ed3
parent 60446c56a5 96dc297bab
28 changed files with 352 additions and 55 deletions
--- a/static/fontello.json
+++ b/static/fontello.json
@ -339,6 +339,12 @@
      "css": "arrow-curved",
      "code": 59426,
      "src": "iconic"
+    },
+    {
+      "uid": "0ddd3e8201ccc7d41f7b7c9d27eca6c1",
+      "css": "link",
+      "code": 59427,
+      "src": "fontawesome"
    }
  ]
-}
+}