mirror of
https://github.com/funamitech/mastodon
synced 2024-12-05 02:09:05 +09:00
d8fdbb054e
Conflicts: - `app/validators/status_length_validator.rb`: Upstream changes too close to glitch-soc MAX_CHARS changes, but not a real conflict. Applied upstream changes. - `package.json`: glitch-soc-only dependency textually too close to a dependency updated upstream, not a real conflict. Applied upstream changes. |
||
---|---|---|
.. | ||
account_controller_concern.rb | ||
account_owned_concern.rb | ||
accountable_concern.rb | ||
authorization.rb | ||
cache_concern.rb | ||
challengable_concern.rb | ||
export_controller_concern.rb | ||
localized.rb | ||
rate_limit_headers.rb | ||
registration_spam_concern.rb | ||
session_tracking_concern.rb | ||
sign_in_token_authentication_concern.rb | ||
signature_authentication.rb | ||
signature_verification.rb | ||
status_controller_concern.rb | ||
two_factor_authentication_concern.rb | ||
user_tracking_concern.rb |