diff options
| author | jessib <jessib@riseup.net> | 2013-11-21 11:22:30 -0800 |
|---|---|---|
| committer | jessib <jessib@riseup.net> | 2013-11-21 11:22:30 -0800 |
| commit | 15b234bf798f3c6347f3c5a13fd1ddfdb744354d (patch) | |
| tree | 2850982de44badbe87e06dca2adbaf9493a26215 /Gemfile.lock | |
| parent | f1bc68c73e7183a0ad30c6aefc6cc4cbbf1bc1f0 (diff) | |
| parent | 19eac22510fcb4ad74456cc3872196fa1e63a93d (diff) | |
Merge branch 'develop' into feature/return_public_key
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 |