Merge branch 'remake-remodel' into develop
authorlain <lain@soykaf.club>
Thu, 19 Mar 2020 17:00:55 +0000 (18:00 +0100)
committerlain <lain@soykaf.club>
Thu, 19 Mar 2020 17:00:55 +0000 (18:00 +0100)
commit3c2c32b460c2d942d085725d14e77a96c4a01e4c
tree1542ba8f33738650c561a1f944ae7ce9e16dd116
parentac5c2b66b9f106bad117708cf74e3007c434d09e
parentd4bafabfd14887e61eb5bc1d877035dcfebbd33f
Merge branch 'remake-remodel' into develop
22 files changed:
lib/pleroma/object/containment.ex
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/activity_pub/object_validator.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/stat_test.exs
test/tasks/database_test.exs
test/user_test.exs
test/web/activity_pub/activity_pub_test.exs
test/web/activity_pub/transmogrifier_test.exs
test/web/activity_pub/views/object_view_test.exs
test/web/common_api/common_api_test.exs
test/web/mastodon_api/controllers/notification_controller_test.exs
test/web/mastodon_api/controllers/status_controller_test.exs
test/web/mastodon_api/views/notification_view_test.exs
test/web/ostatus/ostatus_controller_test.exs
test/web/pleroma_api/controllers/account_controller_test.exs
test/web/push/impl_test.exs
test/web/streamer/streamer_test.exs