lain 436d1a3c41 Merge branch 'develop' into 'issue/2115' ... # Conflicts: # CHANGELOG.md		2020-09-23 11:49:19 +00:00
..
account_controller.ex	AccountController: Remove unused `update_?` routes.	2020-07-07 16:53:20 +02:00
chat_controller.ex	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/2115	2020-09-22 17:13:46 +02:00
conversation_controller.ex	Use atoms as keys in `ActivityPub.fetch_*` functions options	2020-06-04 21:36:26 +04:00
emoji_file_controller.ex	updated errors on add emoji	2020-08-22 10:56:26 +03:00
emoji_pack_controller.ex	added Pleroma.Web.PleromaAPI.EmojiFileController	2020-08-19 06:50:20 +03:00
emoji_reaction_controller.ex	Let favourites and emoji reactions optionally be hidden	2020-07-28 14:58:30 -05:00
mascot_controller.ex	…
notification_controller.ex	…
scrobble_controller.ex	Use atoms as keys in `ActivityPub.fetch_*` functions options	2020-06-04 21:36:26 +04:00
two_factor_authentication_controller.ex	…
user_import_controller.ex	added api spec	2020-09-07 07:17:30 +03:00