Alex Gleason 7c96c82b5b Merge remote-tracking branch 'pleroma/develop' into cycles-views		2021-05-29 12:17:24 -05:00
..
account_controller.ex	Create real Views for all Controllers	2021-05-29 12:15:57 -05:00
backup_controller.ex
chat_controller.ex
conversation_controller.ex	Create real Views for all Controllers	2021-05-29 12:15:57 -05:00
emoji_file_controller.ex
emoji_pack_controller.ex
emoji_reaction_controller.ex
instances_controller.ex
mascot_controller.ex
notification_controller.ex	Create real Views for all Controllers	2021-05-29 12:15:57 -05:00
report_controller.ex
scrobble_controller.ex
two_factor_authentication_controller.ex
user_import_controller.ex