diff options
| author | elijah <elijah@riseup.net> | 2016-01-10 13:48:03 -0800 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2016-01-10 13:48:03 -0800 |
| commit | be1f937ac57c4acaeda5c1377e7023b2d5766dd8 (patch) | |
| tree | 7a5e60bbddfc77d11408db23ed1bb1e0bcf14457 /Gemfile.lock | |
| parent | ba98c75ca83b6236bc4c953396638ea8b6d2ece2 (diff) | |
| parent | 7c4122110f9c8b538a1268fdab4fe486816800ed (diff) | |
Merge branch 'remove_couponcode' of https://github.com/Alster-Hamburgers/leap_web into remove_couponcode
# Conflicts:
# lib/tasks/invite_code.rake
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 7f5e21a..da4df87 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -92,7 +92,6 @@ GEM actionpack (~> 3.0) couchrest couchrest_model - coupon_code (0.0.1) cucumber (1.3.17) builder (>= 2.1.2) diff-lcs (>= 1.1.3) @@ -283,7 +282,6 @@ DEPENDENCIES couchrest (~> 1.1.3) couchrest_model (~> 2.0.0) couchrest_session_store (= 0.3.0) - coupon_code cucumber-rails debugger factory_girl_rails |