mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-02 04:54:25 +00:00
b368c75029
Conflicts: - `app/controllers/concerns/sign_in_token_authentication_concern.rb`: Upstream removed this file, while glitch-soc had changes to deal with its theming system. Removed the file like upstream did. |
||
---|---|---|
.. | ||
access_token_tracking_concern.rb | ||
account_controller_concern.rb | ||
account_owned_concern.rb | ||
accountable_concern.rb | ||
authorization.rb | ||
cache_concern.rb | ||
captcha_concern.rb | ||
challengable_concern.rb | ||
export_controller_concern.rb | ||
localized.rb | ||
rate_limit_headers.rb | ||
registration_spam_concern.rb | ||
session_tracking_concern.rb | ||
signature_authentication.rb | ||
signature_verification.rb | ||
status_controller_concern.rb | ||
theming_concern.rb | ||
two_factor_authentication_concern.rb | ||
user_tracking_concern.rb |