Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel
authorlain <lain@soykaf.club>
Wed, 4 Dec 2019 15:35:59 +0000 (16:35 +0100)
committerlain <lain@soykaf.club>
Wed, 4 Dec 2019 15:35:59 +0000 (16:35 +0100)
commite9993acdbbd1649bbcbf3fb36581b91145fe6055
treeb78d91c904e307a504ed91a06ab718d8c694ca5c
parent1bd1f62af55e01613e6362661b36a19091c87424
parent228bf4d214abe3bb62c52128d3bc145e396b174d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel
13 files changed:
lib/pleroma/object/containment.ex
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/web/common_api/common_api.ex
lib/pleroma/web/mastodon_api/controllers/status_controller.ex
test/notification_test.exs
test/object_test.exs
test/user_test.exs
test/web/activity_pub/transmogrifier_test.exs
test/web/common_api/common_api_test.exs
test/web/mastodon_api/views/notification_view_test.exs
test/web/ostatus/ostatus_controller_test.exs
test/web/streamer/streamer_test.exs