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
..
mailer	Digest emails	2019-04-20 19:42:19 +07:00
email_view.ex	Improve digest email template	2019-08-14 20:46:05 +07:00
error_helpers.ex	update copyright years to 2019	2018-12-31 15:41:47 +00:00
error_view.ex	Replace Mix.env with Pleroma.Config.get(:env)	2019-06-06 23:59:51 +03:00
layout_view.ex	update copyright years to 2019	2018-12-31 15:41:47 +00:00
masto_fe_view.ex	Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation	2019-10-20 20:43:18 +03:00
streamer_view.ex	Extract status actions from MastodonAPIController into StatusController	2019-09-27 10:51:15 +07:00