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

This commit is contained in:
Thibaut Girka
2019-05-30 13:31:01 +02:00
17 changed files with 407 additions and 271 deletions

View File

@@ -66,7 +66,7 @@
"@babel/plugin-transform-react-inline-elements": "^7.2.0",
"@babel/plugin-transform-react-jsx-self": "^7.2.0",
"@babel/plugin-transform-react-jsx-source": "^7.2.0",
"@babel/plugin-transform-runtime": "^7.3.4",
"@babel/plugin-transform-runtime": "^7.4.4",
"@babel/preset-env": "^7.3.4",
"@babel/preset-react": "^7.0.0",
"@babel/runtime": "^7.3.4",
@@ -78,7 +78,7 @@
"babel-loader": "^8.0.5",
"babel-plugin-lodash": "^3.3.4",
"babel-plugin-preval": "^3.0.1",
"babel-plugin-react-intl": "^3.0.1",
"babel-plugin-react-intl": "^3.1.0",
"babel-plugin-transform-react-remove-prop-types": "^0.4.24",
"babel-runtime": "^6.26.0",
"blurhash": "^1.0.0",
@@ -93,7 +93,7 @@
"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",
@@ -106,9 +106,9 @@
"intersection-observer": "^0.5.1",
"intl": "^1.2.5",
"intl-messageformat": "^2.2.0",
"intl-relativeformat": "^2.1.0",
"intl-relativeformat": "^2.2.0",
"is-nan": "^1.2.1",
"js-yaml": "^3.11.0",
"js-yaml": "^3.13.1",
"lodash": "^4.7.11",
"mark-loader": "^0.1.6",
"marky": "^1.2.1",
@@ -136,7 +136,7 @@
"react-motion": "^0.5.2",
"react-notification": "^6.8.4",
"react-overlays": "^0.8.3",
"react-redux": "^6.0.0",
"react-redux": "^6.0.1",
"react-redux-loading-bar": "^4.0.8",
"react-router-dom": "^4.1.1",
"react-router-scroll-4": "^1.0.0-beta.1",
@@ -152,7 +152,7 @@
"rellax": "^1.7.1",
"requestidlecallback": "^0.3.0",
"reselect": "^4.0.0",
"rimraf": "^2.6.1",
"rimraf": "^2.6.3",
"sass": "^1.17.2",
"sass-loader": "^7.0.3",
"stringz": "^1.0.0",