merge master

This commit is contained in:
Michael Ball 2021-05-04 16:54:01 -07:00
parent 4da42e8492
commit e8610a9e62

View file

@ -722,12 +722,11 @@ DEPENDENCIES
json-schema
leaflet-rails
letter_opener
letter_opener_web (~> 1.0)
mimemagic
letter_opener_web
mina
mini_magick
money-rails
nokogiri (>= 1.8.1)
nokogiri
omniauth
omniauth-discourse
omniauth-facebook