Merge branch 'master' of github.com:netlify/netlify-faunadb-example

# Conflicts:
#	package.json
#	src/App.js
#	src/setupProxy.js
This commit is contained in:
DavidWells 2019-01-07 12:56:01 -08:00
commit 65522c08ec
2 changed files with 19 additions and 19 deletions

View file

@ -1,4 +1,4 @@
const proxy = require('http-proxy-middleware');
const proxy = require('http-proxy-middleware')
module.exports = function(app) {
app.use(
@ -8,5 +8,5 @@ module.exports = function(app) {
'^/\\.netlify/functions': ''
}
})
);
};
)
}