Merge branch 'develop' into refactor/deactivated_user_field
authorMark Felder <feld@feld.me>
Mon, 25 Jan 2021 15:45:06 +0000 (09:45 -0600)
committerMark Felder <feld@feld.me>
Mon, 25 Jan 2021 15:45:06 +0000 (09:45 -0600)
commit537ba1c5e07a33692ed63ca50b50e240efce6f88
tree2a364998d729d1f65d5b87b5703604ac8d163678
parent28581e03ad5761aa484a7fa427be8ab5695f0892
parent0a6f5f479348eff5f5404d4455fcb8254809812f
Merge branch 'develop' into refactor/deactivated_user_field
CHANGELOG.md
lib/pleroma/user.ex
lib/pleroma/user/query.ex
test/pleroma/user_test.exs
test/pleroma/web/common_api_test.exs