Merge branch 'master' of gitlab.com:minds/front into feat/a13-upgrade…

…-ben
Minds · Feb 11, 2022 · 45b3bcd · 45b3bcd
2 parents 16808c5 + 546681c
commit 45b3bcd
Show file tree

Hide file tree

Showing 62 changed files with 951 additions and 549 deletions.
diff --git a/angular.json b/angular.json
@@ -81,6 +81,7 @@
               "node_modules/material-design-lite/dist/material.blue_grey-amber.min.css",
               "node_modules/plyr/dist/plyr.css",
               "node_modules/highlight.js/styles/github.css",
+              "node_modules/@ctrl/ngx-emoji-mart/picker.css",
               "src/main.css"
             ],
             "scripts": [