You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Ivan Tashkinov 835ac2157c Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes ... # Conflicts: # CHANGELOG.md		5 years ago
..
account_controller.ex	[#1335] Reorganized users.subscribers as UserRelationship. Added tests for UserRelationship-related functionality.	5 years ago
emoji_api_controller.ex	[#1427] Fixes / improvements of admin scopes support. Added tests.	5 years ago
mascot_controller.ex	[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.	5 years ago
pleroma_api_controller.ex	Merge remote-tracking branch 'origin/develop' into reactions	5 years ago
scrobble_controller.ex	[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes	5 years ago