Thibaut Girka 61631f4751 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - README.md - app/javascript/styles/mastodon/components.scss conflicts caused by image URLs being different - app/models/status.rb as_home_timeline removed, kept glitch-soc-only as_direct_timeline - app/views/statuses/_simple_status.html.haml - config/locales/en.yml some strings were changed upstream - spec/models/status_spec.rb as_home_timeline removed, kept glitch-soc-only as_direct_timeline		2019-10-10 17:26:08 +02:00
..
account_actions	Add option to include reported statuses in warning e-mail (#11639)	2019-08-23 22:37:23 +02:00
account_moderation_notes
account_warnings
accounts	Add account bio to account admin view (#11473)	2019-09-09 14:15:52 +02:00
action_logs	Use local time in audit log (#10751)	2019-05-11 06:46:01 +02:00
change_emails
custom_emojis	Merge branch 'master' into glitch-soc/merge-upstream	2019-10-10 17:26:08 +02:00
dashboard	Merge branch 'master' into glitch-soc/merge-upstream	2019-09-30 12:23:57 +02:00
domain_allows	Fix upstream changes breaking because of glitch-soc's theming engine	2019-09-13 20:28:22 +02:00
domain_blocks	Fix domain block edition in glitch-soc	2019-08-08 09:14:20 +02:00
email_domain_blocks
followers
instances	Fix admin interface showing superfluous reject media/reports on suspended blocks (#11749)	2019-09-03 22:53:27 +02:00
invites	Fix maxed-out invites not showing up as expired in UI (#10274)	2019-03-15 05:35:17 +01:00
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-09-13 18:13:43 +02:00
settings	Merge branch 'master' into glitch-soc/merge-upstream	2019-10-10 17:26:08 +02:00
statuses
tags	Merge branch 'master' into glitch-soc/merge-upstream	2019-10-03 11:10:12 +02:00
warning_presets