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
..
account_controller_test.exs	[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.	2019-10-16 21:59:21 +03:00
emoji_api_controller_test.exs	[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.	2019-10-16 21:59:21 +03:00
mascot_controller_test.exs
pleroma_api_controller_test.exs	[#1304]. Post-merge fixes. Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1304-user-info-deprecation	2019-10-20 22:29:56 +03:00
scrobble_controller_test.exs