exoego 9e42567210 Merge remote-tracking branch 'upstream/master' into tagging-apigw
# Conflicts:
#	lib/plugins/aws/package/compile/events/apiGateway/index.test.js
#	lib/plugins/aws/package/compile/events/apiGateway/lib/apiKeys.js
#	lib/plugins/aws/package/compile/events/apiGateway/lib/apiKeys.test.js
#	lib/plugins/aws/package/compile/events/apiGateway/lib/stage.js
#	lib/plugins/aws/package/compile/events/apiGateway/lib/stage.test.js
2019-04-17 11:24:00 +09:00
..