Merge branch 'master' into 176895554/mailbluster

This commit is contained in:
CactusPuppy 2021-04-12 15:27:20 -07:00 committed by GitHub
commit d6fe38bb2c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
22 changed files with 291 additions and 34 deletions

View file

@ -364,6 +364,7 @@ GEM
rack-openid (~> 1.3.1)
open4 (1.3.4)
orm_adapter (0.5.0)
pagy (3.12.0)
paper_trail (10.3.1)
activerecord (>= 4.2)
request_store (~> 1.1)
@ -735,6 +736,7 @@ DEPENDENCIES
omniauth-github
omniauth-google-oauth2
omniauth-openid
pagy (< 4.0)
paper_trail
pdf-inspector
pg