Merge branch 'master' into glitch-soc/master

Conflicts: app/models/account.rb app/views/accounts/_header.html.haml
2018-05-09 17:43:30 +02:00
parent 143878d9da ac788ad47e
commit 1c9c0167b7
145 changed files with 3052 additions and 803 deletions
--- a/package.json
+++ b/package.json
@@ -50,6 +50,7 @@
    "emoji-mart": "Gargron/emoji-mart#build",
    "es6-symbol": "^3.1.1",
    "escape-html": "^1.0.3",
+    "exif-js": "^2.3.0",
    "express": "^4.16.2",
    "extract-text-webpack-plugin": "^3.0.2",
    "file-loader": "^0.11.2",