diff options
author | jessib <jessib@riseup.net> | 2013-12-02 11:56:04 -0800 |
---|---|---|
committer | jessib <jessib@riseup.net> | 2013-12-02 11:56:04 -0800 |
commit | 2a2ffd46bf4e6009f2957fb4e4abdedbfa7e3245 (patch) | |
tree | 41dd790266aaa951dfa35889527f78015f8c4451 /Gemfile.lock | |
parent | 8e9b65b01bbd9d44d4077d94f2dc4ac375cf8e85 (diff) | |
parent | 8de6f143e53af5287b41913dcf3c7969f452fbc9 (diff) |
Merge branch 'develop' into feature/service_level
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index e6096fd..8d80546 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -25,7 +25,7 @@ PATH leap_web_core (0.2.5) couchrest (~> 1.1.3) couchrest_model (~> 2.0.0) - couchrest_session_store (~> 0.2.0) + couchrest_session_store (~> 0.2.1) json rails (~> 3.2.11) @@ -110,7 +110,7 @@ GEM couchrest (~> 1.1.3) mime-types (>= 1.15) tzinfo (>= 0.3.22) - couchrest_session_store (0.2.0) + couchrest_session_store (0.2.1) actionpack couchrest couchrest_model |