Ivan Tashkinov 835ac2157c Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes ... # Conflicts: # CHANGELOG.md		2019-12-10 08:55:14 +03:00
..
account_controller.ex	[#1335] Reorganized users.subscribers as UserRelationship. Added tests for UserRelationship-related functionality.	2019-11-20 15:46:11 +03:00
emoji_api_controller.ex	[#1427] Fixes / improvements of admin scopes support. Added tests.	2019-12-06 20:33:47 +03:00
mascot_controller.ex	[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.	2019-10-16 21:59:21 +03:00
pleroma_api_controller.ex	Merge remote-tracking branch 'origin/develop' into reactions	2019-11-08 13:27:11 +01:00
scrobble_controller.ex	[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes	2019-10-02 20:42:40 +03:00