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 d392020da6 Merge branch 'master' into glitch-soc/tentative-merge ... Conflicts: README.md app/controllers/statuses_controller.rb app/lib/feed_manager.rb config/navigation.rb spec/lib/feed_manager_spec.rb Conflicts were resolved by taking both versions for each change. This means the two filter systems (glitch-soc's keyword mutes and tootsuite's custom filters) are in place, which will be changed in a follow-up commit.		6 years ago
..
account_moderation_notes	Improve admin UI for accounts (#7360)	7 years ago
accounts	Remove unnecessary underline on accounts table (#7728)	7 years ago
action_logs	Improve report layout (#7188)	7 years ago
change_emails	Feature: Allow staff to change user emails (#7074)	7 years ago
custom_emojis	keep the same filters and page when doing custom emojo stuff (fixes #6112) (#6114)	7 years ago
domain_blocks	…
email_domain_blocks	…
instances	…
invites	Add invite filter (#5862)	7 years ago
report_notes	Improve report layout (#7188)	7 years ago
reports	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
settings	Add admin setting to enable OG previews for sensitive media (#7962)	6 years ago
statuses	Merge branch 'master' into glitch-soc/master	7 years ago
subscriptions	…