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

2019-03-30 12:36:24 +01:00
parent b6fa500806 51625d3423
commit 4444d8f9b3
29 changed files with 454 additions and 182 deletions
--- a/2
+++ b/2
@@ -108,7 +108,7 @@ group :production, :test do
 end

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