Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma...
authorlain <lain@soykaf.club>
Wed, 4 Nov 2020 14:05:01 +0000 (15:05 +0100)
committerlain <lain@soykaf.club>
Wed, 4 Nov 2020 14:05:01 +0000 (15:05 +0100)
commit329aa19c9f1175f915441c84689860155949bb08
tree17a92069fdb2f49d2f82efdabf3bec1e20822508
parent755f58168bb2b6b979c6f5d36f7eff56d2305911
parentbc4d9c4ffc9ccd826220893a97ce695e4bb66f9d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-restrict-domain
CHANGELOG.md
lib/pleroma/web/activity_pub/activity_pub.ex
test/pleroma/web/admin_api/controllers/admin_api_controller_test.exs
test/pleroma/web/mastodon_api/controllers/timeline_controller_test.exs
test/pleroma/web/streamer_test.exs