tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Thibaut Girka
2019-09-05 11:36:41 +02:00
parent 0128509605 e265b8887d
commit 5088eb8388
55 changed files with 635 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
package.json
View File

@ -68,7 +68,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.5.0",
"@babel/plugin-transform-runtime": "^7.4.4",
"@babel/plugin-transform-runtime": "^7.5.5",
"@babel/preset-env": "^7.5.5",
"@babel/preset-react": "^7.0.0",
"@babel/runtime": "^7.5.4",
@ -172,7 +172,7 @@
"websocket.js": "^0.1.12"
},
"devDependencies": {
"babel-eslint": "^10.0.2",
"babel-eslint": "^10.0.3",
"babel-jest": "^24.8.0",
"enzyme": "^3.10.0",
"enzyme-adapter-react-16": "^1.14.0",