Fix merge conflicts with upstream
authorSean King <seanking2919@protonmail.com>
Fri, 4 Jun 2021 20:42:44 +0000 (14:42 -0600)
committerSean King <seanking2919@protonmail.com>
Fri, 4 Jun 2021 20:42:44 +0000 (14:42 -0600)
commitdc4814f0cdc12a552001e5e22c979060e4f3f865
tree38f8cb1729338768da447a27ae243c27d301c7bd
parent2de41770d04cf07ed8775a307b6d457a4750e265
parent0c56f9de0d607b88fd107e0bd13ef286f0629346
Fix merge conflicts with upstream
CHANGELOG.md
config/config.exs
config/description.exs
docs/configuration/cheatsheet.md
lib/pleroma/user.ex
lib/pleroma/web/o_auth/o_auth_controller.ex
lib/pleroma/web/router.ex
test/pleroma/user_test.exs
test/pleroma/web/plugs/frontend_static_plug_test.exs