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
..
2019-10-20 20:43:18 +03:00
2019-10-20 20:43:18 +03:00
2019-04-22 07:20:43 +00:00
2019-10-20 13:42:42 +03:00
2019-10-18 14:50:09 +00:00
2019-10-07 12:20:41 +00:00
2019-10-20 20:43:18 +03:00
2019-10-07 12:20:41 +00:00
2019-09-17 16:16:11 +03:00
2019-09-19 00:16:33 +03:00
2019-10-16 21:59:21 +03:00
2019-10-18 14:50:09 +00:00
2019-10-20 20:43:18 +03:00
2019-09-29 18:43:27 +03:00
2019-09-15 14:53:58 +03:00
2019-10-20 20:43:18 +03:00
2019-10-19 12:15:14 +02:00
2019-10-20 13:42:42 +03:00
2019-10-20 20:43:18 +03:00
2019-10-18 14:50:09 +00:00
2019-09-30 19:10:54 +07:00
2019-10-01 11:44:34 +07:00
2019-09-27 21:59:23 +00:00
2019-10-20 20:43:18 +03:00
2019-10-19 20:11:58 +00:00
2019-10-01 19:43:22 +03:00
2019-09-10 22:01:45 +03:00