Merge remote-tracking branch 'upstream/develop' into registration-workflow
authorAlex Gleason <alex@alexgleason.me>
Thu, 17 Dec 2020 15:04:43 +0000 (09:04 -0600)
committerAlex Gleason <alex@alexgleason.me>
Thu, 17 Dec 2020 15:05:36 +0000 (09:05 -0600)
commit80891e83d8df25b742a321d2c837e38c805e6582
tree915321403b8a1639fa317b72d438b8a61a0eb090
parent4999efad3f0bb0a70a5be5d5c2b970ab564668ca
parent8b8c317c0ff1534d3296369ba315b8919e8dc55c
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
test/mix/tasks/pleroma/user_test.exs
test/pleroma/user_test.exs