lain 504a829edb Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/federation-status		2020-11-04 15:38:10 +01:00
..
account_controller.ex	Merge branch 'develop' into feature/gen-magic	2020-10-13 10:08:38 -05:00
backup_controller.ex	Fix credo warnings	2020-10-20 17:47:04 +04:00
chat_controller.ex	Add with_muted param to ChatController.index/2	2020-11-04 16:40:12 +04:00
conversation_controller.ex	alias alphabetically order	2020-10-13 16:43:59 +03:00
emoji_file_controller.ex	changes after rebase	2020-10-13 17:10:34 +03:00
emoji_pack_controller.ex	fixes after rebase	2020-10-13 16:44:02 +03:00
emoji_reaction_controller.ex	alias alphabetically order	2020-10-13 16:43:59 +03:00
instances_controller.ex	Apply 1 suggestion(s) to 1 file(s)	2020-10-21 19:40:37 +00:00
mascot_controller.ex	Merge branch 'develop' into feature/gen-magic	2020-10-13 10:08:38 -05:00
notification_controller.ex	OAuthScopesPlug module name	2020-10-13 16:43:54 +03:00
scrobble_controller.ex	alias alphabetically order	2020-10-13 16:43:59 +03:00
two_factor_authentication_controller.ex	alias alphabetically order	2020-10-13 16:43:59 +03:00
user_import_controller.ex	changes after rebase	2020-10-13 17:10:34 +03:00