diff options
| author | ThibG <thib@sitedethib.com> | 2019-09-19 00:22:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-19 00:22:39 +0200 |
| commit | febcdad2e2c98aee62b55ee21bdf0debf7c6fd6b (patch) | |
| tree | 1a99988dd7a46824527e59ee1861aa72ad7412ce /package.json | |
| parent | ab646fac5f582fe9bef22d8b9a4995fbb4b42d7d (diff) | |
| parent | 2ecc7106d7fc222ca84777fc279e9f46f80afd5a (diff) | |
Merge pull request #1221 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/package.json b/package.json index 3cdd0abcb..97d3ec497 100644 --- a/package.json +++ b/package.json @@ -93,7 +93,7 @@ "detect-passive-events": "^1.0.2", "dotenv": "^8.0.0", "emoji-mart": "Gargron/emoji-mart#build", - "es6-symbol": "^3.1.1", + "es6-symbol": "^3.1.2", "escape-html": "^1.0.3", "exif-js": "^2.3.0", "express": "^4.17.1", @@ -101,6 +101,7 @@ "favico.js": "^0.3.10", "font-awesome": "^4.7.0", "glob": "^7.1.1", + "history": "^4.10.1", "http-link-header": "^1.0.2", "immutable": "^3.8.2", "imports-loader": "^0.8.0", @@ -177,7 +178,7 @@ "enzyme": "^3.10.0", "enzyme-adapter-react-16": "^1.14.0", "eslint": "^6.1.0", - "eslint-plugin-import": "~2.18.0", + "eslint-plugin-import": "~2.18.2", "eslint-plugin-jsx-a11y": "~6.2.3", "eslint-plugin-promise": "~4.2.1", "eslint-plugin-react": "~7.14.3", |