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
..
about	Merge remote-tracking branch 'origin/master' into gs-master	2018-04-04 13:56:58 -05:00
stream_entries	Remove .p-name microformat class (#7961)	2018-07-07 18:51:56 +02:00