feld e2f2602fdc Merge branch 'emoji-api-errors' into 'develop' ... Emoji api error if emoji dir is not writable Closes admin-fe#62 See merge request pleroma/pleroma!2161		2020-01-30 14:13:40 +00: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	Update emoji_api_controller.ex	2020-01-30 14:09:41 +00: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	Emoji Reactions: Correctly handle deleted users	2020-01-29 11:43:36 +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