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
..
ecto	Bump copyright years of files changed in 2019	2019-09-18 23:21:11 +02:00
benchmark.ex	Add extended benchmark	2019-09-11 11:13:17 +03:00
config.ex	Move config task docs to a separate file and mark it as WIP	2019-10-03 14:12:57 +03:00
count_statuses.ex	Add a task to re-count statuses for all users	2019-10-09 13:11:57 +07:00
database.ex	Fix a migration wiping user info of users that don't have any mutes	2019-10-18 15:22:07 +03:00
digest.ex	Mix tasks: derive moduledoc from doc files	2019-10-03 14:00:23 +03:00
docs.ex	refactoring	2019-09-11 09:25:33 +03:00
emoji.ex	Merge branch 'mix-emoji-task-pack-json' into 'develop'	2019-10-19 08:51:03 +00:00
instance.ex	Mix tasks: derive moduledoc from doc files	2019-10-03 14:00:23 +03:00
relay.ex	Add GET /api/pleroma/admin/relay endpoint - lists all followed relays	2019-10-11 19:12:29 +03:00
robotstxt.ex	robots.txt	2019-03-15 02:28:18 +00:00
uploads.ex	Mix tasks: derive moduledoc from doc files	2019-10-03 14:00:23 +03:00
user.ex	[#1304] Moved remaining fields from User.Info to User.	2019-10-20 13:42:42 +03:00