diff options
author | Azul <azul@riseup.net> | 2016-07-05 08:54:49 +0200 |
---|---|---|
committer | Azul <azul@riseup.net> | 2016-07-05 08:54:49 +0200 |
commit | 949e17c7c30c5b179ba6545782ae995178481f78 (patch) | |
tree | 45d06cab909b2ae197ec208e542ffc19f05e4e53 /Gemfile.lock | |
parent | 798c1240b59403b8d8de9559776718266b2ecba5 (diff) | |
parent | 77a75ef44e98ea3756161dbe8e52ad994e4e098d (diff) |
Merge remote-tracking branch 'pr/224' into merge-branch
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index e0dc859..ff69a08 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -124,11 +124,9 @@ GEM nokogiri (~> 1.5) railties (>= 3, < 5) cucumber-wire (0.0.1) - daemons (1.2.3) debug_inspector (0.0.2) diff-lcs (1.2.5) erubis (2.7.0) - eventmachine (1.2.0.1) execjs (2.6.0) factory_girl (4.7.0) activesupport (>= 3.0.0) @@ -276,10 +274,6 @@ GEM therubyracer (0.12.2) libv8 (~> 3.16.14.0) ref - thin (1.6.4) - daemons (~> 1.0, >= 1.0.9) - eventmachine (~> 1.0, >= 1.0.4) - rack (~> 1.0) thor (0.19.1) thread_safe (0.3.5) tilt (2.0.2) @@ -342,7 +336,6 @@ DEPENDENCIES sass-rails simple_form therubyracer - thin uglifier valid_email |