Jeremy Kescher bad37d4102 Merge remote-tracking branch 'upstream/main' ... # Conflicts: # public/android-chrome-192x192.png # public/apple-touch-icon.png # public/browserconfig.xml # public/favicon.ico # public/mstile-150x150.png		2022-06-13 23:47:34 +02:00
..
chewy	Revert reverting "Change algorithm of tootctl search deploy to improve performance (#18463)".	2022-05-26 20:58:16 +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 remote-tracking branch 'upstream/main'	2022-06-13 23:47:34 +02:00
lib	Make rate limits even less strict	2022-06-12 23:18:03 +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