Merge remote-tracking branch 'upstream/develop' into registration-workflow
authorAlex Gleason <alex@alexgleason.me>
Sat, 21 Nov 2020 16:23:53 +0000 (10:23 -0600)
committerAlex Gleason <alex@alexgleason.me>
Sat, 21 Nov 2020 16:23:53 +0000 (10:23 -0600)
commit30ed7b502f5db14a4635d3d80a62df3c18b91813
tree84a76b9881e8545a6afc472c9c97b044735e248c
parent9546c1444c2c8c4abc9bcb35b6a8ff360ddc83af
parentecd1ef8cb5afa16dba5158e9e278a18c0856ca3e
Merge remote-tracking branch 'upstream/develop' into registration-workflow
CHANGELOG.md
lib/pleroma/user.ex