Merge branch 'master' into glitch-soc/merge-upstream

2019-03-22 13:05:17 +01:00
parent bde9196b70 3411fbef19
commit edd5441112
8 changed files with 17 additions and 15 deletions
--- a/2
+++ b/2
@ -108,7 +108,7 @@ group :production, :test do
 end

 group :test do
-  gem 'capybara', '~> 3.14'
+  gem 'capybara', '~> 3.15'
  gem 'climate_control', '~> 0.2'
  gem 'faker', '~> 1.9'
  gem 'microformats', '~> 4.1'