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
..
applications	Add more granular OAuth scopes (#7929)	6 years ago
deletes	…
exports	Add hint about 7 day cooldown for archive takeout (#7375)	7 years ago
flavours	…
follower_domains	…
imports	…
keyword_mutes	Add apply-to-mentions option to keyword mute UI. #454.	6 years ago
migrations	…
notifications	…
preferences	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
profiles	Merge branch 'master' into glitch-soc/master	6 years ago
shared	…
two_factor_authentication	…
two_factor_authentications	…