Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no...
authorIvan Tashkinov <ivantashkinov@gmail.com>
Sat, 17 Oct 2020 10:12:39 +0000 (13:12 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Sat, 17 Oct 2020 10:12:39 +0000 (13:12 +0300)
commit049ece1ef38f1aeb656a88ed1d15bf3d4a364e01
tree16d4a05e533685e8b8385f886e58addb05a90d7d
parent2498e569f12694439b6f99d0730f6fb36301c454
parent023f726d7f497705d766adee8874b94efb08a0aa
Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances

# Conflicts:
# lib/pleroma/web/feed/user_controller.ex
# lib/pleroma/web/o_status/o_status_controller.ex
# lib/pleroma/web/router.ex
# lib/pleroma/web/static_fe/static_fe_controller.ex
CHANGELOG.md
lib/pleroma/web/feed/user_controller.ex
lib/pleroma/web/o_status/o_status_controller.ex
lib/pleroma/web/router.ex
test/pleroma/web/activity_pub/activity_pub_controller_test.exs
test/pleroma/web/feed/tag_controller_test.exs
test/pleroma/web/feed/user_controller_test.exs
test/pleroma/web/o_status/o_status_controller_test.exs
test/pleroma/web/static_fe/static_fe_controller_test.exs