Merge remote-tracking branch 'upstream/develop' into by-approval
authorAlex Gleason <alex@alexgleason.me>
Mon, 27 Jul 2020 17:29:18 +0000 (12:29 -0500)
committerAlex Gleason <alex@alexgleason.me>
Mon, 27 Jul 2020 17:29:18 +0000 (12:29 -0500)
commit6747bf2e1642d7715a9f08469247bc99ff7165cb
tree9161918fc6979ac2fa1f41f203a1e42cd89fc7c8
parent6931dbfa582f0e5360e74dffdceee1b9ed564b17
parent2a3abfd326f0cbb588dfe66a23e9783be3038a5e
Merge remote-tracking branch 'upstream/develop' into by-approval
CHANGELOG.md
config/config.exs
config/description.exs
docs/configuration/cheatsheet.md
lib/pleroma/user.ex
test/user_test.exs