From: Thibaut Girka <thib@sitedethib.com>
Date: Thu, 30 May 2019 11:31:01 +0000 (+0200)
Subject: Merge branch 'master' into glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=06036081a0759b0b5635afa6e6f5d6ed49233add;p=mastodon.git

Merge branch 'master' into glitch-soc/merge-upstream
---

06036081a0759b0b5635afa6e6f5d6ed49233add
diff --cc package.json
index 826a1935b,50cc6e159..53fe77899
--- a/package.json
+++ b/package.json
@@@ -93,8 -91,7 +93,8 @@@
      "es6-symbol": "^3.1.1",
      "escape-html": "^1.0.3",
      "exif-js": "^2.3.0",
-     "express": "^4.16.4",
+     "express": "^4.17.1",
 +    "favico.js": "^0.3.10",
      "fibers": "^3.1.1",
      "file-loader": "^3.0.1",
      "font-awesome": "^4.7.0",