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

2019-02-28 21:35:53 +01:00
parent 76ed481aa7 ee7d79c0ce
commit 2267eee356
22 changed files with 417 additions and 21 deletions
--- a/2
+++ b/2
@@ -108,7 +108,7 @@ group :production, :test do
 end

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