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
..
2018-01-16 03:29:11 +01:00
2016-02-20 22:53:20 +01:00
2016-08-17 17:58:00 +02:00
2017-04-22 19:48:55 +02:00
2017-08-08 21:52:15 +02:00
2017-12-10 11:08:04 -08:00
2017-12-06 15:04:49 +09:00
2017-04-11 01:11:41 +02:00
2016-12-06 17:19:26 +01:00
2017-01-22 23:07:31 +01:00
2016-08-17 17:58:00 +02:00