Merge branch 'icon_picker_admin_config' into 'develop'

Add font icon picker for admin config, fixes #338 Closes #338 See merge request soapbox-pub/soapbox-fe!219
2020-10-28 03:57:06 +00:00
parent fd5ab3258e 0e5a7b61b0
commit a36f172be9
8 changed files with 1072 additions and 22 deletions
--- a/package.json
+++ b/package.json
@ -62,7 +62,7 @@
    "cssnano": "^4.1.10",
    "detect-passive-events": "^2.0.0",
    "dotenv": "^8.0.0",
-    "emoji-mart": "Gargron/emoji-mart#build",
+    "emoji-mart": "https://gitlab.com/seanking2919/emoji-mart#build",
    "es6-symbol": "^3.1.1",
    "escape-html": "^1.0.3",
    "exif-js": "^2.3.0",