Merge remote-tracking branch 'upstream/develop' into registration-workflow
authorAlex Gleason <alex@alexgleason.me>
Sun, 15 Nov 2020 01:48:47 +0000 (19:48 -0600)
committerAlex Gleason <alex@alexgleason.me>
Sun, 15 Nov 2020 01:48:47 +0000 (19:48 -0600)
commit9546c1444c2c8c4abc9bcb35b6a8ff360ddc83af
treecc6b9add45f34878b1ce053b6a408e059768fa6a
parentdc38dc847207e4724265fbeb111d0a236b75f93f
parent28da36975dc325bb577ee81fb791fbdc7ec3e7e2
Merge remote-tracking branch 'upstream/develop' into registration-workflow
CHANGELOG.md
lib/mix/tasks/pleroma/user.ex
lib/pleroma/emails/user_email.ex
lib/pleroma/user.ex
lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
test/mix/tasks/pleroma/user_test.exs
test/pleroma/user_test.exs