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_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	Merge branch 'master' into glitch-soc/merge-upstream	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	…