Thibaut Girka 16ff7c5627 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - Gemfile - Gemfile.lock - app/controllers/about_controller.rb - app/controllers/auth/sessions_controller.rb		2019-09-30 12:23:57 +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	…
change_emails	…
custom_emojis	Fix upstream changes breaking because of glitch-soc's theming engine	2019-09-13 20:28:22 +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	…
pending_accounts	…
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-09-13 18:13:43 +02:00
statuses	…
tags	Merge branch 'master' into glitch-soc/merge-upstream	2019-09-30 12:23:57 +02:00
warning_presets	…