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
..
v1	Merge branch 'master' into glitch-soc/tentative-merge	6 years ago
v2	…
web	…
base_controller_spec.rb	…
oembed_controller_spec.rb	…
push_controller_spec.rb	…
salmon_controller_spec.rb	…
subscriptions_controller_spec.rb	…