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-05-01 13:28:04 +00:00
2019-10-16 21:59:21 +03:00
2019-10-07 12:20:41 +00:00
2019-09-18 23:21:11 +02:00
2019-10-20 20:43:18 +03:00
2019-09-18 23:21:11 +02:00
2019-10-07 12:20:41 +00:00
2019-05-17 18:21:11 +02:00
2019-10-16 21:59:21 +03:00
2019-10-19 23:16:15 +00:00
2019-10-20 20:43:18 +03:00
2019-09-18 23:21:11 +02:00
2019-09-18 23:21:11 +02:00
2019-08-20 20:20:12 +00:00
2019-10-16 21:59:21 +03:00
2019-10-16 21:59:21 +03:00
2019-09-18 23:21:11 +02:00
2019-10-18 14:50:09 +00:00
2019-07-26 20:27:38 +00:00
2019-10-20 20:43:18 +03:00
2019-10-16 21:59:21 +03:00
2019-10-16 21:59:21 +03:00
2019-08-25 08:03:25 +02:00
2019-09-18 23:21:11 +02:00