summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorjessib <jessib@riseup.net>2012-10-29 11:18:51 -0700
committerjessib <jessib@riseup.net>2012-10-29 11:18:51 -0700
commit2de76b40a926985fce186c8ba18450d310ed4fa3 (patch)
tree89644aaeb9d20ae819819f211de5f5f8cf0dd8e8 /Gemfile.lock
parent3ba2e664a26e96a93c8640b57241af6386db361e (diff)
parent8b9d5235faed6c15e8ef2e2dc76aec7f24d0bb50 (diff)
Merge branch 'help_develop' into develop
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock7
1 files changed, 7 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index a982c2a..86cb8e8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -15,6 +15,12 @@ PATH
rails (~> 3.2.8)
PATH
+ remote: help
+ specs:
+ leap_web_help (0.1.0)
+ leap_web_core (= 0.1.0)
+
+PATH
remote: users
specs:
leap_web_users (0.1.0)
@@ -173,6 +179,7 @@ DEPENDENCIES
jquery-rails
leap_web_certs!
leap_web_core!
+ leap_web_help!
leap_web_users!
mocha
ruby-debug