archive-gh-me/serverless
1
0
Fork 0
mirror of https://github.com/serverless/serverless.git synced 2026-01-25 15:07:39 +00:00
Code Issues Projects Releases Wiki Activity
serverless/lib/plugins/aws/deploy/compile
History
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
..
events
Merge branch 'master'
2016-08-13 21:47:35 +01:00
functions
Update custom provider resource merging
2016-08-12 15:52:21 +02:00