Claire 15929a3d59 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Our README is completely different. Discarded upstream changes. - `app/javascript/packs/mailer.js`: We had removed the file. Move the changes to `app/javascript/core/mailer.js`.		2022-06-11 00:08:41 +02:00
..
chewy	Change algorithm of `tootctl search deploy` to improve performance (#18463)	2022-05-22 22:16:43 +02:00
controllers	Merge branch 'main' into glitch-soc/merge-upstream	2022-06-10 11:51:43 +02:00
helpers	Merge branch 'main' into glitch-soc/merge-upstream	2022-06-11 00:08:41 +02:00
javascript	Merge branch 'main' into glitch-soc/merge-upstream	2022-06-11 00:08:41 +02:00
lib	Fix TagManager#local_url? erroring out on invalid URL (#18580)	2022-05-31 18:25:24 +02:00
mailers	Prevent use locale with empty string (#18543)	2022-05-28 14:32:08 +02:00
models	Merge branch 'main' into glitch-soc/merge-upstream	2022-06-10 11:51:43 +02:00
policies	Merge branch 'main' into glitch-soc/merge-upstream	2022-06-10 11:51:43 +02:00
presenters	Add administrative webhooks (#18510)	2022-06-09 21:57:36 +02:00
serializers	Merge branch 'main' into glitch-soc/merge-upstream	2022-06-11 00:08:41 +02:00
services	Merge branch 'main' into glitch-soc/merge-upstream	2022-06-10 11:51:43 +02:00
validators	Merge branch 'main' into glitch-soc/merge-upstream	2022-06-10 11:51:43 +02:00
views	Merge branch 'main' into glitch-soc/merge-upstream	2022-06-11 00:08:41 +02:00
workers	Merge branch 'main' into glitch-soc/merge-upstream	2022-06-10 11:51:43 +02:00