merge upstream

This commit is contained in:
Michael Ball 2020-01-05 13:50:57 -08:00
commit 2be789884b

View file

@ -372,7 +372,10 @@ GEM
slop (~> 3.4)
public_suffix (3.1.1)
puma (3.12.2)
rack (2.0.7)
rack (2.0.8)
rack-openid (1.3.1)
rack (>= 1.1.0)
ruby-openid (>= 2.1.8)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (5.2.3)