merge develop

2019-04-02 10:53:33 -04:00 · 2019-04-02 10:53:33 -04:00 · 79efe0646c
commit 79efe0646c
parent 2ee8d21366
51 changed files with 835 additions and 157 deletions
--- a/static/font/config.json
+++ b/static/font/config.json
@ -251,6 +251,12 @@
      "css": "smile",
      "code": 61720,
      "src": "fontawesome"
+    },
+    {
+      "uid": "671f29fa10dda08074a4c6a341bb4f39",
+      "css": "bell-alt",
+      "code": 61683,
+      "src": "fontawesome"
    }
  ]
 }