Merge remote-tracking branch 'pleroma/develop' into dont-crash-email-settings
authorAlex Gleason <alex@alexgleason.me>
Mon, 3 May 2021 19:43:28 +0000 (14:43 -0500)
committerAlex Gleason <alex@alexgleason.me>
Mon, 3 May 2021 19:43:28 +0000 (14:43 -0500)
commitc186b059a77bf6cece831887948e23ee95222a1a
tree3a3a052f8c76b99e44ea5eb25d6b6bd659af23dc
parentc80b1aaf514dec6b538a9833d48df027708b6b4d
parent377f84f3678f9c2541fbd4a200cd93c5ab0dea24
Merge remote-tracking branch 'pleroma/develop' into dont-crash-email-settings
test/pleroma/user_test.exs