diff options
author | varac <varacanero@zeromail.org> | 2014-09-03 23:08:08 +0200 |
---|---|---|
committer | varac <varacanero@zeromail.org> | 2014-09-03 23:08:08 +0200 |
commit | 0df84cf7987c3047ecc0353e8d29c2c38437a5a2 (patch) | |
tree | c0db8548571cba8ef8bb5c2a258136c97780acf7 /platform.rb | |
parent | a54b82ff7cdae2e44bc3c159473ca03e283f0746 (diff) | |
parent | b806d84a2fc292e3fb8a3f5fd1fb029c2cdb629e (diff) |
Merge branch 'master' into develop
Conflicts:
platform.rb
puppet/modules/site_config/manifests/hosts.pp
Diffstat (limited to 'platform.rb')
-rw-r--r-- | platform.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/platform.rb b/platform.rb index 872a34cb..270dd25a 100644 --- a/platform.rb +++ b/platform.rb @@ -4,7 +4,7 @@ # Leap::Platform.define do - self.version = "0.5.3" + self.version = "0.5.4.1" self.compatible_cli = "1.5.8".."1.99" # |