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 61631f4751 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - README.md - app/javascript/styles/mastodon/components.scss conflicts caused by image URLs being different - app/models/status.rb as_home_timeline removed, kept glitch-soc-only as_direct_timeline - app/views/statuses/_simple_status.html.haml - config/locales/en.yml some strings were changed upstream - spec/models/status_spec.rb as_home_timeline removed, kept glitch-soc-only as_direct_timeline		5 years ago
..
account_batch.rb	…
admin_settings.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
challenge.rb	Add password challenge to 2FA settings, e-mail notifications (#11878)	5 years ago
custom_emoji_batch.rb	…
delete_confirmation.rb	Fix 2FA challenge and password challenge for non-database users (#11831)	5 years ago
redirect.rb	Add (back) option to set redirect notice on account without moving followers (#11994)	5 years ago
status_batch.rb	…
tag_batch.rb	…
two_factor_confirmation.rb	Fix TOTP codes not being filtered from logs during enabling/disabling (#11877)	5 years ago