Christopher G. Paton b66b0612f6 Merge branch 'master'
Conflicts:
	lib/plugins/aws/deploy/compile/events/apiGateway/lib/methods.js
	lib/plugins/aws/deploy/compile/events/apiGateway/tests/methods.js
2016-08-13 21:47:35 +01:00
..
2016-08-13 21:47:35 +01:00
2016-07-20 21:43:20 +03:00
2016-08-08 08:27:26 +02:00
2016-08-08 08:27:26 +02:00
2016-08-11 19:07:01 +09:00