diff options
| author | azul <azul@riseup.net> | 2013-12-20 11:28:42 -0800 |
|---|---|---|
| committer | azul <azul@riseup.net> | 2013-12-20 11:28:42 -0800 |
| commit | 9d1fdcb1d5a18c74776b43cb78e3dc305fdddffc (patch) | |
| tree | 20a6789a80c0cdaa14623b9a809eccb122841f91 /Gemfile.lock | |
| parent | 76517637ddf70577bd2a14bebb8a57552fbb1776 (diff) | |
| parent | 5818a2a101cc89c778c5a5e62271ab42b1fa4c70 (diff) | |
Merge pull request #128 from elijh/feature/configure_billing
make billing configurable from platform
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 918fdba..cd65c89 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -138,6 +138,7 @@ GEM thin faker (1.2.0) i18n (~> 0.5) + ffi (1.9.3) haml (3.1.8) haml-rails (0.3.5) actionpack (>= 3.1, < 4.1) @@ -169,6 +170,8 @@ GEM multi_json (1.8.2) nokogiri (1.6.0) mini_portile (~> 0.5.0) + phantomjs-binaries (1.9.2.3) + sys-uname (= 0.9.0) poltergeist (1.4.1) capybara (~> 2.1.0) cliver (~> 0.2.1) @@ -229,6 +232,8 @@ GEM multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) + sys-uname (0.9.0) + ffi (>= 1.0.0) therubyracer (0.10.2) libv8 (~> 3.3.10) thin (1.5.1) @@ -277,6 +282,7 @@ DEPENDENCIES leap_web_help! leap_web_users! mocha (~> 0.13.0) + phantomjs-binaries poltergeist quiet_assets rails-i18n |