Merge remote-tracking branch 'origin/master'

u jann · u jann · commit 41dea8ab88a4 · 2016-11-25T10:20:33.000+01:00
diff --git a/README.md b/README.md
@@ -84,7 +84,7 @@ See here: http://vansande.org/2015/03/20/npm-link/
 
 ## Release History
 
-* 0.2.1 proxyIntegration: CORS in Preflight, status code 400 for invalid body
+* 0.2.1 proxyIntegration: CORS in Preflight, status code 400 for invalid body, set more CORS headers as default
 * 0.2.0 Attention: breaking changes for configuration; add SNS event process
 * 0.1.0 make it work now 
 * 0.0.1 initial release
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "aws-lambda-router",
-  "version": "0.1.1",
+  "version": "0.2.1",
   "description": "AWS lambda router",
   "main": "index.js",
   "scripts": {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "aws-lambda-router",`
`3`		`- "version": "0.1.1",`
	`3`	`+ "version": "0.2.1",`
`4`	`4`	`"description": "AWS lambda router",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"scripts": {`