Merge branch 'develop' into rename/pleroma_activity_consistency
authorlain <lain@soykaf.club>
Wed, 23 Jan 2019 12:05:58 +0000 (13:05 +0100)
committerlain <lain@soykaf.club>
Wed, 23 Jan 2019 12:05:58 +0000 (13:05 +0100)
commit2de208817c04d9a48aaf0fdaf887dd0e10d15907
tree38cf094a6405c147fe5d8cff3be173f2379166d9
parent7390192c03248ff18eff19d555f28300a7b07e09
parentb624b7a150c813722c4ffe82112c03e246fb5760
Merge branch 'develop' into rename/pleroma_activity_consistency
lib/pleroma/activity.ex
lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/web/activity_pub/utils.ex
lib/pleroma/web/mastodon_api/views/status_view.ex
test/web/activity_pub/transmogrifier_test.exs