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
..
admin	Improvements to toots display in admin view (#7452)	2018-05-12 17:44:15 +02:00
settings
application_helper.rb	Add more granular OAuth scopes (#7929)	2018-07-05 18:31:35 +02:00
flashes_helper.rb
home_helper.rb
instance_helper.rb
jsonld_helper.rb	Fetch boosted statuses on behalf of a follower (fixes #7426) (#7459)	2018-05-12 16:48:32 +02:00
mailer_helper.rb
routing_helper.rb
settings_helper.rb	Weblate translations (2018-07-05) (#7950)	2018-07-05 21:50:16 +09:00
stream_entries_helper.rb	Fix double-encoding of display name in title and e-mails (#7534)	2018-05-18 15:56:57 +02:00