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 cf8121376b 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
..
credentials_controller_spec.rb	Merge branch 'master' into glitch-soc/tentative-merge	6 years ago
follower_accounts_controller_spec.rb	Add more granular OAuth scopes (#7929)	6 years ago
following_accounts_controller_spec.rb	Add more granular OAuth scopes (#7929)	6 years ago
lists_controller_spec.rb	Add more granular OAuth scopes (#7929)	6 years ago
relationships_controller_spec.rb	Add more granular OAuth scopes (#7929)	6 years ago
search_controller_spec.rb	Add more granular OAuth scopes (#7929)	6 years ago
statuses_controller_spec.rb	Add more granular OAuth scopes (#7929)	6 years ago