Claire e4f8679eae Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/models/form/admin_settings.rb`: New setting added upstream. Ported it. - `app/views/statuses/_simple_status.html.haml`: Upstream removed RTL classes. Did the same. - `config/settings.yml`: New setting added upstream. Ported it.		2020-12-15 14:27:06 +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-12-15 14:27:06 +01:00
helpers	Merge branch 'master' into glitch-soc/merge-upstream	2020-12-15 14:27:06 +01:00
javascript	Merge branch 'master' into glitch-soc/merge-upstream	2020-12-15 14:27:06 +01:00
lib	Merge branch 'master' into glitch-soc/merge-upstream	2020-12-15 14:27:06 +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-12-15 14:27:06 +01:00
policies	Merge branch 'master' into glitch-soc/merge-upstream	2020-12-15 14:27:06 +01:00
presenters	Merge branch 'master' into glitch-soc/merge-upstream	2020-12-15 14:27:06 +01:00
serializers	Merge branch 'master' into glitch-soc/merge-upstream	2020-12-15 14:27:06 +01:00
services	Merge branch 'master' into glitch-soc/merge-upstream	2020-12-15 14:27:06 +01:00
validators	Merge branch 'master' into glitch-soc/merge-upstream	2020-12-10 09:41:49 +01:00
views	Merge branch 'master' into glitch-soc/merge-upstream	2020-12-15 14:27:06 +01:00
workers	Merge branch 'master' into glitch-soc/merge-upstream	2020-12-15 14:27:06 +01:00