mastodon/app
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
..
chewy
controllers Merge branch 'master' into glitch-soc/tentative-merge 2018-07-09 07:13:59 +02:00
helpers Merge branch 'master' into glitch-soc/tentative-merge 2018-07-09 07:13:59 +02:00
javascript Merge branch 'master' into glitch-soc/tentative-merge 2018-07-09 07:13:59 +02:00
lib Merge branch 'master' into glitch-soc/tentative-merge 2018-07-09 07:13:59 +02:00
mailers
models Merge branch 'master' into glitch-soc/tentative-merge 2018-07-09 07:13:59 +02:00
policies Merge remote-tracking branch 'origin/master' into gs-master 2018-05-03 17:23:44 -05:00
presenters Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-05-04 18:17:32 +00:00
serializers Merge branch 'master' into glitch-soc/tentative-merge 2018-07-09 07:13:59 +02:00
services Merge branch 'master' into glitch-soc/tentative-merge 2018-07-09 07:13:59 +02:00
validators Merge branch 'master' into glitch-soc/tentative-merge 2018-07-09 07:13:59 +02:00
views Merge branch 'master' into glitch-soc/tentative-merge 2018-07-09 07:13:59 +02:00
workers Fix domain hiding logic (#7765) 2018-06-09 22:46:54 +02:00