Merge branch 'master' into edit-profile-frontend

This commit is contained in:
2019-10-01 16:54:13 -04:00
committed by GitHub
15 changed files with 348 additions and 83 deletions

View File

@@ -24,5 +24,17 @@
"test": "react-scripts test --env=jsdom",
"eject": "react-scripts eject"
},
"proxy": "https://us-central1-twistter-e4649.cloudfunctions.net/api"
"browserslist": {
"production": [
">0.2%",
"not dead",
"not op_mini all"
],
"development": [
"last 1 chrome version",
"last 1 firefox version",
"last 1 safari version"
]
},
"proxy": "https://us-central1-twistter-e4649.cloudfunctions.net/api"
}