akkoma/test/web/mastodon_api
Ivan Tashkinov a11a7176d5 Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
# Conflicts:
#	lib/pleroma/user/info.ex
#	lib/pleroma/web/activity_pub/activity_pub.ex
#	lib/pleroma/web/activity_pub/transmogrifier.ex
2019-10-21 11:05:09 +03:00
..
controllers Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation 2019-10-21 11:05:09 +03:00
views Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation 2019-10-20 20:43:18 +03:00
mastodon_api_controller_test.exs Move :favourites and :bookmarks actions to StatusController 2019-10-02 21:31:19 +07:00
mastodon_api_test.exs [] Moved all non-mutes / non-blocks fields from User.Info to User. WIP. 2019-10-16 21:59:21 +03:00