Merge branch 'develop' into fix/signup-without-email
authorEgor Kislitsyn <egor@kislitsyn.com>
Mon, 2 Mar 2020 11:35:49 +0000 (15:35 +0400)
committerEgor Kislitsyn <egor@kislitsyn.com>
Mon, 2 Mar 2020 11:35:49 +0000 (15:35 +0400)
commit4a45b96a91485a39f26bcc86b6cbd21d1547511e
treeb4a6cc3f7be26b84b85d3a1ff3adc9b896b54e85
parentf446744a6a72d707504c2ba20ea2326f956b5097
parent45b08ca1665920564c9daf35a96e93dff031a649
Merge branch 'develop' into fix/signup-without-email
CHANGELOG.md
lib/pleroma/user.ex
test/web/mastodon_api/controllers/account_controller_test.exs