lain ef55d24054 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/emojireactvalidator

2020-05-07 18:53:34 +02:00

..

account_controller.ex

…

emoji_api_controller.ex

…

mascot_controller.ex

…

pleroma_api_controller.ex

Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/emojireactvalidator

2020-05-07 18:53:34 +02:00

scrobble_controller.ex

…

two_factor_authentication_controller.ex

Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController

2020-05-07 08:14:54 +00:00