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 16ff7c5627 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - Gemfile - Gemfile.lock - app/controllers/about_controller.rb - app/controllers/auth/sessions_controller.rb		5 years ago
..
account_actions	Add option to include reported statuses in warning e-mail (#11639)	5 years ago
account_moderation_notes	…
account_warnings	…
accounts	Add account bio to account admin view (#11473)	5 years ago
action_logs	…
change_emails	…
custom_emojis	Fix upstream changes breaking because of glitch-soc's theming engine	5 years ago
dashboard	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
domain_allows	Fix upstream changes breaking because of glitch-soc's theming engine	5 years ago
domain_blocks	Fix domain block edition in glitch-soc	5 years ago
email_domain_blocks	…
followers	…
instances	Fix admin interface showing superfluous reject media/reports on suspended blocks (#11749)	5 years ago
invites	…
pending_accounts	…
relays	…
report_notes	…
reports	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
settings	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
statuses	…
tags	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
warning_presets	…