Merge remote-tracking branch 'upstream/develop' into by-approval
authorAlex Gleason <alex@alexgleason.me>
Tue, 14 Jul 2020 23:56:40 +0000 (18:56 -0500)
committerAlex Gleason <alex@alexgleason.me>
Tue, 14 Jul 2020 23:56:40 +0000 (18:56 -0500)
1  2 
CHANGELOG.md
config/description.exs
docs/configuration/cheatsheet.md
lib/pleroma/user.ex
test/web/admin_api/controllers/admin_api_controller_test.exs

diff --cc CHANGELOG.md
Simple merge
Simple merge
Simple merge
Simple merge