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
..
account_view.ex	Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation	2019-10-20 20:43:18 +03:00
config_view.ex	admin api configure changes	2019-07-11 13:02:13 +00:00
moderation_log_view.ex	Add pagination to logs	2019-09-01 21:23:30 +03:00
report_view.ex	Fix merge	2019-09-30 19:10:54 +07:00