Erik Erikson e3e686044a Merge branch 'master' into add-per-function-custom-roles ...

# Conflicts:
#	lib/plugins/aws/deploy/compile/functions/index.js

2016-09-27 12:23:22 -07:00

..

classes

Merge pull request #2101 from serverless/update-tracking-functionality

2016-09-22 14:35:04 +02:00

plugins

Merge branch 'master' into add-per-function-custom-roles

2016-09-27 12:23:22 -07:00

Serverless.js

overwrite functionality working

2016-08-31 16:37:58 +09:00