Ivan Tashkinov
ee04fbc35a
[#1304]. Post-merge fixes. Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1304-user-info-deprecation
# Conflicts:
# CHANGELOG.md
# lib/pleroma/notification.ex
# lib/pleroma/user.ex
# lib/pleroma/user/info.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 22:29:56 +03:00
..
2019-09-16 17:55:04 +07:00
2019-07-10 05:13:23 +00:00
2019-08-19 15:34:29 +00:00
2019-10-20 22:29:56 +03:00
2019-10-16 21:59:21 +03:00
2019-10-16 21:59:21 +03:00
2019-08-31 10:14:53 +03:00
2019-10-18 14:50:10 +00:00
2019-08-19 15:34:29 +00:00
2019-09-19 00:16:33 +03:00
2019-09-27 10:51:15 +07:00
2019-10-18 14:50:09 +00:00
2019-10-16 21:59:21 +03:00
2019-10-18 14:50:10 +00:00
2019-10-16 21:59:21 +03:00
2019-08-19 15:34:29 +00:00
2019-08-19 15:34:29 +00:00
2019-10-20 22:29:56 +03:00
2019-07-24 14:46:08 +02:00
2019-10-09 16:03:45 +02:00
2019-07-10 05:13:23 +00:00
2019-09-18 23:21:11 +02:00
2019-09-18 23:21:11 +02:00
2019-08-22 20:59:58 +03:00
2019-08-31 10:14:53 +03:00
2018-12-23 20:57:10 +00:00
2019-10-16 21:59:21 +03:00
2019-09-26 18:49:57 +07:00
2019-09-18 23:21:11 +02:00
2018-12-23 20:57:10 +00:00
2019-10-02 15:24:21 +07:00
2019-07-10 05:13:23 +00:00
2019-09-30 19:10:54 +07:00
2019-10-20 20:43:18 +03:00
2019-10-16 21:59:21 +03:00
2019-09-18 21:57:49 +00:00
2019-09-03 13:58:27 +03:00
2019-04-05 15:12:02 +03:00
2019-07-10 05:13:23 +00:00
2019-10-01 20:00:27 +00:00
2019-10-18 15:22:16 +03:00
2019-09-18 23:21:11 +02:00
2019-10-20 20:43:18 +03:00
2019-09-18 21:57:49 +00:00
2019-09-18 23:21:11 +02:00
2019-07-10 05:13:23 +00:00
2019-10-16 15:09:39 +03:00
2019-10-20 20:43:18 +03:00
2018-12-23 20:57:10 +00:00