Claire 6e56f95285 Merge commit '4a7395d989e40c3bd4ef18173aa5ea850c8ddcdd' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream modified its README, we have a completely different one. Kept our README file.		2023-12-21 18:17:17 +01:00
..
chewy	Clamp dates when serializing to Elasticsearch API (#28081)	2023-11-27 13:25:54 +00:00
controllers	Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream	2023-12-20 22:16:50 +01:00
helpers	Merge commit '4a7395d989e40c3bd4ef18173aa5ea850c8ddcdd' into glitch-soc/merge-upstream	2023-12-21 18:17:17 +01:00
javascript	Merge commit '4a7395d989e40c3bd4ef18173aa5ea850c8ddcdd' into glitch-soc/merge-upstream	2023-12-21 18:17:17 +01:00
lib	Merge commit '4a7395d989e40c3bd4ef18173aa5ea850c8ddcdd' into glitch-soc/merge-upstream	2023-12-21 18:17:17 +01:00
mailers	Use `admin_mailer` layout with initial salutation (#28085)	2023-11-28 07:41:26 +00:00
models	Merge commit '4a7395d989e40c3bd4ef18173aa5ea850c8ddcdd' into glitch-soc/merge-upstream	2023-12-21 18:17:17 +01:00
policies	Merge commit '272592d16d40e804ec325ef3b5e6de9bbad5f2dd' into glitch-soc/merge-upstream	2023-12-20 22:05:31 +01:00
presenters	Add admin notifications for new Mastodon versions (#26582)	2023-09-01 17:47:07 +02:00
serializers	Merge commit '272592d16d40e804ec325ef3b5e6de9bbad5f2dd' into glitch-soc/merge-upstream	2023-12-20 22:05:31 +01:00
services	Merge commit '4a7395d989e40c3bd4ef18173aa5ea850c8ddcdd' into glitch-soc/merge-upstream	2023-12-21 18:17:17 +01:00
validators	Merge commit '973597c6f1e25b16c592e5573304319aeaa375e1' into glitch-soc/merge-upstream	2023-12-19 20:51:37 +01:00
views	Fix glitch-only HAML linting issue	2023-12-20 22:27:29 +01:00
workers	Merge commit '272592d16d40e804ec325ef3b5e6de9bbad5f2dd' into glitch-soc/merge-upstream	2023-12-20 22:05:31 +01:00