Merge branch 'dev' into fix/notifications

This commit is contained in:
Brenda Wallace
2019-07-17 09:30:28 +12:00
committed by GitHub

View File

@@ -86,7 +86,7 @@ GEM
uniform_notifier (~> 1.11)
byebug (11.0.1)
cancancan (3.0.1)
capybara (3.25.0)
capybara (3.26.0)
addressable
mini_mime (>= 0.1.3)
nokogiri (~> 1.8)
@@ -297,7 +297,7 @@ GEM
mime-types-data (3.2019.0331)
mimemagic (0.3.3)
mini_magick (4.9.3)
mini_mime (1.0.1)
mini_mime (1.0.2)
mini_portile2 (2.4.0)
minitest (5.11.3)
moneta (1.0.0)