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
..
account_moderation_notes	Improve admin UI for accounts (#7360)	2018-05-05 23:06:29 +02:00
accounts	Remove unnecessary underline on accounts table (#7728)	2018-06-04 13:09:36 +02:00
action_logs	Improve report layout (#7188)	2018-04-20 02:28:48 +02:00
change_emails	Feature: Allow staff to change user emails (#7074)	2018-04-10 09:16:06 +02:00
custom_emojis	keep the same filters and page when doing custom emojo stuff (fixes #6112) (#6114)	2017-12-30 02:43:43 +01:00
domain_blocks
email_domain_blocks
instances
invites	Add invite filter (#5862)	2017-12-01 16:40:02 +01:00
report_notes	Improve report layout (#7188)	2018-04-20 02:28:48 +02:00
reports	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-05-21 18:17:23 +00:00
settings	Add admin setting to enable OG previews for sensitive media (#7962)	2018-07-06 02:15:56 +02:00
statuses	Merge branch 'master' into glitch-soc/master	2018-05-10 00:03:28 +02:00
subscriptions