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.		2018-07-09 07:13:59 +02:00
..
v1	Merge branch 'master' into glitch-soc/tentative-merge	2018-07-09 07:13:59 +02:00
v2
web
base_controller.rb	Add more granular OAuth scopes (#7929)	2018-07-05 18:31:35 +02:00
oembed_controller.rb
push_controller.rb
salmon_controller.rb
subscriptions_controller.rb