Thibaut Girka 1488be7d96 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/home_controller.rb - app/controllers/shares_controller.rb - app/javascript/packs/public.js - app/models/status.rb - app/serializers/initial_state_serializer.rb - app/views/home/index.html.haml - app/views/layouts/public.html.haml - app/views/public_timelines/show.html.haml - app/views/shares/show.html.haml - app/views/tags/show.html.haml - config/initializers/content_security_policy.rb - config/locales/en.yml - config/webpack/shared.js - package.json		2019-08-19 21:49:35 +02:00
..
account_actions
account_moderation_notes
account_warnings
accounts	Add domain block notes (#11515)	2019-08-07 20:20:23 +02:00
action_logs	Use local time in audit log (#10751)	2019-05-11 06:46:01 +02:00
change_emails
custom_emojis
dashboard	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-08 08:44:33 +02:00
domain_allows	Add whitelist mode (#11291)	2019-07-30 11:10:46 +02:00
domain_blocks	Fix domain block edition in glitch-soc	2019-08-08 09:14:20 +02:00
email_domain_blocks
followers
instances	Add domain block notes (#11515)	2019-08-07 20:20:23 +02:00
invites
pending_accounts	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-07 17:00:36 +02:00
relays
report_notes
reports	Merge branch 'master' into glitch-soc/merge-upstream	2019-07-19 18:26:49 +02:00
settings	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-19 21:49:35 +02:00
statuses
tags	Fix weekly usage not being displayed correctly in hashtag admin UI (#11524)	2019-08-08 23:03:28 +02:00
warning_presets