Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instan...
authorIvan Tashkinov <ivantashkinov@gmail.com>
Thu, 12 Mar 2020 09:07:07 +0000 (12:07 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Thu, 12 Mar 2020 09:07:07 +0000 (12:07 +0300)
commitbd40880fa0ed328c2948bb145354a8292fe051b5
treed997a20a129cd72fe24c1f7169e1f6952339ce02
parent5b696a8ac1b5a06e60c2143cf88e014b28e14702
parent00d17520314e3591caaa7ab4ca39c6227a6bdf15
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions

# Conflicts:
# test/web/activity_pub/activity_pub_controller_test.exs
test/web/activity_pub/activity_pub_controller_test.exs