distraction.party/lib/pleroma/web/streamer
Ivan Tashkinov c6fdfbc4f1 Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
# Conflicts:
#	CHANGELOG.md
#	lib/pleroma/notification.ex
#	lib/pleroma/user.ex
#	lib/pleroma/user/info.ex
#	lib/pleroma/web/activity_pub/activity_pub.ex
#	lib/pleroma/web/admin_api/admin_api_controller.ex
#	lib/pleroma/web/ostatus/handlers/follow_handler.ex
#	lib/pleroma/web/ostatus/ostatus.ex
#	lib/pleroma/web/salmon/salmon.ex
#	lib/pleroma/web/websub/websub.ex
#	test/web/admin_api/admin_api_controller_test.exs
#	test/web/federator_test.exs
#	test/web/mastodon_api/controllers/conversation_controller_test.exs
#	test/web/ostatus/ostatus_controller_test.exs
#	test/web/ostatus/ostatus_test.exs
#	test/web/salmon/salmon_test.exs
#	test/web/websub/websub_test.exs
2019-10-20 20:43:18 +03:00
..
ping.ex streamer: add missing copyright headers 2019-10-04 15:21:45 +00:00
state.ex streamer: add missing copyright headers 2019-10-04 15:21:45 +00:00
streamer.ex don't stream in benchmark env 2019-10-15 15:16:17 +03:00
streamer_socket.ex streamer: add missing copyright headers 2019-10-04 15:21:45 +00:00
supervisor.ex streamer: add missing copyright headers 2019-10-04 15:21:45 +00:00
worker.ex [#1304] Moved remaining fields from User.Info to User. 2019-10-20 13:42:42 +03:00