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.

Thibaut Girka aae60a2366 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/concerns/sign_in_token_authentication_concern.rb`: Conflict due to glitch-soc's theming system. Ported upstream changes. - `app/controllers/concerns/two_factor_authentication_concern.rb`: Conflict due to glitch-soc's theming system. Ported upstream changes.		4 years ago
..
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	…
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	…