Merge branch 'master' into develop

This commit is contained in:
Jonne Haß 2015-05-03 15:48:02 +02:00
commit 69842b84a4

View file

@ -4,7 +4,7 @@
defaults: defaults:
version: version:
number: "0.5.0.0" # Do not touch unless doing a release, do not backport the version number that's in master but keep develop to always say "head" number: "head" # Do not touch unless doing a release, do not backport the version number that's in master but keep develop to always say "head"
heroku: false heroku: false
environment: environment:
url: "http://localhost:3000/" url: "http://localhost:3000/"