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)
1  2 
test/pleroma/user_test.exs

Simple merge