Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-28 05:36:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
- app/controllers/application_controller.rb
  Minor conflict due to glitch-soc's theming system
This commit is contained in:
Thibaut Girka
2019-12-12 15:40:06 +01:00
parent 246addd5b3 d08a497946
commit be4849c083
10 changed files with 281 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
package.json
View File

@@ -60,14 +60,14 @@
},
"private": true,
"dependencies": {
"@babel/core": "^7.7.4",
"@babel/core": "^7.7.5",
"@babel/plugin-proposal-class-properties": "^7.7.4",
"@babel/plugin-proposal-decorators": "^7.7.4",
"@babel/plugin-transform-react-inline-elements": "^7.7.4",
"@babel/plugin-transform-runtime": "^7.7.4",
"@babel/plugin-transform-runtime": "^7.7.6",
"@babel/preset-env": "^7.7.4",
"@babel/preset-react": "^7.7.4",
"@babel/runtime": "^7.7.4",
"@babel/runtime": "^7.7.6",
"@gamestdio/websocket": "^0.3.2",
"@clusterws/cws": "^0.16.0",
"array-includes": "^3.0.3",
@@ -91,7 +91,7 @@
"detect-passive-events": "^1.0.2",
"dotenv": "^8.2.0",
"emoji-mart": "Gargron/emoji-mart#build",
"es6-symbol": "^3.1.2",
"es6-symbol": "^3.1.3",
"escape-html": "^1.0.3",
"exif-js": "^2.3.0",
"express": "^4.17.1",
@@ -126,7 +126,7 @@
"prop-types": "^15.5.10",
"punycode": "^2.1.0",
"rails-ujs": "^5.2.4",
"react": "^16.10.2",
"react": "^16.12.0",
"react-dom": "^16.12.0",
"react-hotkeys": "^1.1.4",
"react-immutable-proptypes": "^2.1.0",
@@ -157,7 +157,7 @@
"sass-loader": "^8.0.0",
"stringz": "^2.0.0",
"substring-trie": "^1.0.2",
"terser-webpack-plugin": "^2.2.1",
"terser-webpack-plugin": "^2.2.2",
"tesseract.js": "^2.0.0-alpha.16",
"throng": "^4.0.0",
"tiny-queue": "^0.2.1",
@@ -176,7 +176,7 @@
"enzyme": "^3.10.0",
"enzyme-adapter-react-16": "^1.15.1",
"eslint": "^6.7.2",
"eslint-plugin-import": "~2.18.2",
"eslint-plugin-import": "~2.19.0",
"eslint-plugin-jsx-a11y": "~6.2.3",
"eslint-plugin-promise": "~4.2.1",
"eslint-plugin-react": "~7.17.0",
@@ -186,6 +186,6 @@
"react-test-renderer": "^16.11.0",
"sass-lint": "^1.13.1",
"webpack-dev-server": "^3.9.0",
"yargs": "^13.3.0"
"yargs": "^15.0.2"
}
}