You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		5 years ago
..
mailer	Digest emails	6 years ago
email_view.ex	Improve digest email template	5 years ago
error_helpers.ex	update copyright years to 2019	6 years ago
error_view.ex	Replace Mix.env with Pleroma.Config.get(:env)	5 years ago
layout_view.ex	update copyright years to 2019	6 years ago
masto_fe_view.ex	Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation	5 years ago
streamer_view.ex	Extract status actions from `MastodonAPIController` into `StatusController`	5 years ago