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.

lain 436d1a3c41 Merge branch 'develop' into 'issue/2115' ... # Conflicts: # CHANGELOG.md		4 years ago
..
account_controller_test.exs	AccountController: Remove unused `update_?` routes.	4 years ago
chat_controller_test.exs	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/2115	4 years ago
conversation_controller_test.exs	Move conversation actions to PleromaAPI.ConversationController	4 years ago
emoji_file_controller_test.exs	finland-emojis.zip -> emojis.zip	4 years ago
emoji_pack_controller_test.exs	added Pleroma.Web.PleromaAPI.EmojiFileController	4 years ago
emoji_reaction_controller_test.exs	:show_reactions, add CHANGELOG.md, refactor test	4 years ago
mascot_controller_test.exs	Add OpenAPI spec for MascotController	4 years ago
notification_controller_test.exs	Fix notifications mark as read API	4 years ago
scrobble_controller_test.exs	Add OpenAPI spec for PleromaAPI.ScrobbleController	4 years ago
two_factor_authentication_controller_test.exs	Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController	4 years ago
user_import_controller_test.exs	added api spec	4 years ago