Merge remote-tracking branch 'upstream/develop' into email-fix-develop
authorAlex Gleason <alex@alexgleason.me>
Tue, 22 Sep 2020 18:37:02 +0000 (13:37 -0500)
committerAlex Gleason <alex@alexgleason.me>
Tue, 22 Sep 2020 18:37:02 +0000 (13:37 -0500)
1  2 
test/user_test.exs
test/web/admin_api/controllers/admin_api_controller_test.exs

Simple merge