Claire 5e11f3a6e1 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/styles/mastodon/modal.scss`: For some reason we changed the file loading path in glitch-soc, but now upstream has completely changed how the logo is loaded. Applied upstream changes.		2021-02-12 10:28:32 +01:00
..
chewy	Change tootctl search deploy algorithm (#14300)	2020-07-14 18:10:35 +02:00
controllers	Merge branch 'main' into glitch-soc/merge-upstream	2021-02-12 10:28:32 +01:00
helpers	Merge branch 'main' into glitch-soc/merge-upstream	2021-02-12 10:28:32 +01:00
javascript	Merge branch 'main' into glitch-soc/merge-upstream	2021-02-12 10:28:32 +01:00
lib	Merge branch 'main' into glitch-soc/merge-upstream	2021-02-12 10:28:32 +01:00
mailers	Change account suspensions to be reversible by default (#14726)	2020-09-15 14:37:58 +02:00
models	Merge branch 'main' into glitch-soc/merge-upstream	2021-02-12 10:28:32 +01:00
policies	Merge branch 'master' into glitch-soc/merge-upstream	2020-12-19 00:55:12 +01:00
presenters	Merge branch 'main' into glitch-soc/merge-upstream	2021-01-26 14:01:30 +01:00
serializers	Merge branch 'master' into glitch-soc/merge-upstream	2021-01-06 18:08:06 +01:00
services	Merge branch 'main' into glitch-soc/merge-upstream	2021-02-12 10:28:32 +01:00
validators	Merge pull request #1491 from ThibG/glitch-soc/merge-upstream	2021-01-26 23:21:32 +01:00
views	Merge branch 'main' into glitch-soc/merge-upstream	2021-02-12 10:28:32 +01:00
workers	Merge branch 'master' into glitch-soc/merge-upstream	2021-01-06 18:08:06 +01:00