Merge develop branch upstream
authorSean King <seanking2919@protonmail.com>
Sat, 10 Jul 2021 17:04:16 +0000 (11:04 -0600)
committerSean King <seanking2919@protonmail.com>
Sat, 10 Jul 2021 17:04:16 +0000 (11:04 -0600)
commit5d279a22b162e7d8a871db1b9368a888e92ea167
tree1d89f3c93ee1dc46b185f6d438828fb0b572e6be
parent26d2c677b78b7cc22a98dfe4648e5b3f5b4da3ea
parentaa9a6c3c056fde45b4c13c9c873cef9492b279e9
Merge develop branch upstream
CHANGELOG.md
lib/pleroma/user.ex
lib/pleroma/web/mastodon_api/controllers/app_controller.ex
lib/pleroma/web/o_auth/o_auth_controller.ex
test/pleroma/user_test.exs