Nick den Engelsman c3620e501b Merge branch 'master' of github.com:serverless/serverless
# Conflicts:
#	lib/plugins/aws/deploy/lib/iam-policy-lambda-execution-template.json
2016-11-28 12:03:25 +01:00
..
2016-11-22 12:49:26 +01:00
2016-11-22 12:49:26 +01:00