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.js	Do not require images in about.js and share.js (#6622)	2018-03-04 20:27:40 +01:00
application.js
common.js
public.js	Merge branch 'master' into glitch-soc/tentative-merge	2018-07-09 07:13:59 +02:00
share.js	Do not require images in about.js and share.js (#6622)	2018-03-04 20:27:40 +01:00