Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-validator
authorlain <lain@soykaf.club>
Tue, 23 Jun 2020 08:17:12 +0000 (10:17 +0200)
committerlain <lain@soykaf.club>
Tue, 23 Jun 2020 08:17:12 +0000 (10:17 +0200)
commit2c603f20098d7f342e1cbad8e6a6c86b007c5a99
treedd9a339daed6a25e758167413d9231e22ce42ac4
parentb05f795326b77edd881ffea2c004d7ca0ddd7df9
parent3875a507d4b52df7edbda376d3ed31ad52241ac5
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-validator
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/web/mastodon_api/controllers/account_controller.ex
test/web/activity_pub/transmogrifier_test.exs