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 f8e07ca5cd Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/status.rb Resolved by taking both changes (not a real conflict, just changes too close to each other).		6 years ago
..
account_moderation_notes	…
accounts	Redesign admin accounts index (#9340)	6 years ago
action_logs	…
change_emails	Redesign forms, verify link ownership with rel="me" (#8703)	6 years ago
custom_emojis	Redesign forms, verify link ownership with rel="me" (#8703)	6 years ago
dashboard	Fix tag usage display on admin dashboard	6 years ago
domain_blocks	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
email_domain_blocks	Add option to block reports from domain (#8830)	6 years ago
instances	Add option to block reports from domain (#8830)	6 years ago
invites	Add admin function to deactivate all invites (#8279)	6 years ago
relays	Display pending message on admin relays UI (#8494)	6 years ago
report_notes	Improve report layout (#7188)	7 years ago
reports	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
settings	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
statuses	…
subscriptions	Scrollable tables in settings pages (#4857)	7 years ago
suspensions	Better singulars of account followers/toots. (#8471)	6 years ago