[#1878] Merged `develop`, resolved merge conflicts.
Showing
- lib/pleroma/web/activity_pub/activity_pub.ex 1 addition, 1 deletionlib/pleroma/web/activity_pub/activity_pub.ex
- lib/pleroma/web/common_api/common_api.ex 12 additions, 6 deletionslib/pleroma/web/common_api/common_api.ex
- lib/pleroma/web/mastodon_api/controllers/status_controller.ex 1 addition, 1 deletion...pleroma/web/mastodon_api/controllers/status_controller.ex
- test/notification_test.exs 3 additions, 3 deletionstest/notification_test.exs
- test/object_test.exs 1 addition, 1 deletiontest/object_test.exs
- test/user_test.exs 2 additions, 2 deletionstest/user_test.exs
- test/web/activity_pub/activity_pub_test.exs 8 additions, 8 deletionstest/web/activity_pub/activity_pub_test.exs
- test/web/activity_pub/object_validator_test.exs 1 addition, 1 deletiontest/web/activity_pub/object_validator_test.exs
- test/web/activity_pub/views/object_view_test.exs 1 addition, 1 deletiontest/web/activity_pub/views/object_view_test.exs
- test/web/common_api/common_api_test.exs 1 addition, 2 deletionstest/web/common_api/common_api_test.exs
- test/web/mastodon_api/controllers/notification_controller_test.exs 5 additions, 5 deletions...mastodon_api/controllers/notification_controller_test.exs
- test/web/mastodon_api/controllers/status_controller_test.exs 8 additions, 10 deletionstest/web/mastodon_api/controllers/status_controller_test.exs
- test/web/mastodon_api/views/notification_view_test.exs 1 addition, 1 deletiontest/web/mastodon_api/views/notification_view_test.exs
- test/web/ostatus/ostatus_controller_test.exs 1 addition, 1 deletiontest/web/ostatus/ostatus_controller_test.exs
- test/web/push/impl_test.exs 1 addition, 1 deletiontest/web/push/impl_test.exs
- test/web/streamer/streamer_test.exs 4 additions, 4 deletionstest/web/streamer/streamer_test.exs
Loading
Please register or sign in to comment