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.

1 files changed, 0 insertions, 0 deletions

diff --git a/public/badge.png b/public/badge.png
index a1f2f8b08..c3e99ddd4 100644
--- a/public/badge.png
+++ b/public/badge.png
Binary files differ