Thibaut Girka 48f0f3ffee Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `.github/ISSUE_TEMPLATE/bug_report.md`: Upstream added the `bug` label to bug reports. Did the same. - `app/services/fan_out_on_write_service.rb`: Upstream put DMs back into timelines, glitch-soc was already doing it. Ignored upstream changes.		2020-11-20 13:27:48 +01:00
..
chewy	Change tootctl search deploy algorithm (#14300)	2020-07-14 18:10:35 +02:00
controllers	Merge branch 'master' into glitch-soc/merge-upstream	2020-11-20 13:27:48 +01:00
helpers	Merge branch 'master' into glitch-soc/merge-upstream	2020-11-12 22:13:57 +01:00
javascript	Merge branch 'master' into glitch-soc/merge-upstream	2020-11-20 13:27:48 +01:00
lib	Merge branch 'master' into glitch-soc/merge-upstream	2020-11-20 13:27:48 +01:00
mailers	Change account suspensions to be reversible by default (#14726)	2020-09-15 14:37:58 +02:00
models	Merge branch 'master' into glitch-soc/merge-upstream	2020-11-20 13:27:48 +01:00
policies	Merge branch 'master' into glitch-soc/merge-upstream	2020-11-08 14:20:35 +01:00
presenters	Merge branch 'master' into glitch-soc/merge-upstream	2020-06-30 23:00:20 +02:00
serializers	Fix media not being marked sensitive when outgoing CW is set	2020-11-13 01:05:55 +01:00
services	Merge branch 'master' into glitch-soc/merge-upstream	2020-11-20 13:27:48 +01:00
validators	Merge branch 'master' into glitch-soc/merge-upstream	2020-08-13 22:17:29 +02:00
views	Merge branch 'master' into glitch-soc/merge-upstream	2020-11-20 13:27:48 +01:00
workers	Merge branch 'master' into glitch-soc/merge-upstream	2020-11-20 13:27:48 +01:00