summaryrefslogtreecommitdiff
path: root/lib/leap_web
diff options
context:
space:
mode:
authorjessib <jessib@leap.se>2012-12-07 10:31:12 -0800
committerjessib <jessib@leap.se>2012-12-07 10:31:12 -0800
commite1a004e2b24c2c235452469abfefa033e24435b2 (patch)
treea4b1c89a5aa4d5ccb3c17521499c999dedd5842d /lib/leap_web
parent4793c2b770fcb018303b7ab226b75cc218364327 (diff)
parent8282b83c798ba4e5c1e26ec8243b82669b3ee6d4 (diff)
Merge branch 'master' into help_develop
Conflicts: app/views/layouts/application.html.haml help/app/controllers/tickets_controller.rb help/test/functional/tickets_controller_test.rb users/test/support/stub_record_helper.rb
Diffstat (limited to 'lib/leap_web')
-rw-r--r--lib/leap_web/version.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/leap_web/version.rb b/lib/leap_web/version.rb
index 6a74082..ea13457 100644
--- a/lib/leap_web/version.rb
+++ b/lib/leap_web/version.rb
@@ -1,3 +1,3 @@
module LeapWeb
- VERSION = "0.1.0" unless defined?(LeapWeb::VERSION)
+ VERSION = "0.1.1" unless defined?(LeapWeb::VERSION)
end