Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma...
authorlain <lain@soykaf.club>
Mon, 26 Oct 2020 16:50:34 +0000 (17:50 +0100)
committerlain <lain@soykaf.club>
Mon, 26 Oct 2020 16:50:34 +0000 (17:50 +0100)
commit04b7505c75afbaa1f785b2adaf0313e9b0935fab
treeda42147dc907cb7ffcc576b81b16c6c6ed0ef9ad
parentb3d6cf90229ff3e9a5bd0028d4a6cbd3b68da9fe
parent2f7401806bbe5427bbcaa7cdce35130320ae3bb4
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-block-behavior
CHANGELOG.md
config/config.exs
config/description.exs
lib/pleroma/web/activity_pub/activity_pub.ex
test/pleroma/web/activity_pub/activity_pub_test.exs