Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into develop

2020-07-10 11:27:53 +01:00 · 2020-07-10 11:27:53 +01:00 · 6f621dd34c
commit 6f621dd34c
parent 954d5c05df c1a20079be
67 changed files with 2807 additions and 162 deletions
--- a/static/fontello.json
+++ b/static/fontello.json
@ -399,6 +399,12 @@
      "css": "doc",
      "code": 59433,
      "src": "fontawesome"
+    },
+    {
+      "uid": "98d9c83c1ee7c2c25af784b518c522c5",
+      "css": "block",
+      "code": 59434,
+      "src": "fontawesome"
    }
  ]
 }