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 444796b69b Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/application_controller.rb - app/controllers/auth/confirmations_controller.rb - app/controllers/auth/sessions_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb		5 years ago
..
account_associations.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
account_avatar.rb	…
account_counters.rb	…
account_finder_concern.rb	…
account_header.rb	…
account_interactions.rb	…
attachmentable.rb	…
cacheable.rb	…
domain_normalizable.rb	…
expireable.rb	…
ldap_authenticable.rb	…
omniauthable.rb	…
paginable.rb	…
pam_authenticable.rb	…
redisable.rb	…
relationship_cacheable.rb	…
remotable.rb	…
status_threading_concern.rb	…
user_roles.rb	…