Jeremy Kescher fae98d1deb Merge branch 'refs/heads/glitch-soc' into develop ... # Conflicts: # app/javascript/flavours/glitch/initial_state.js # app/javascript/mastodon/initial_state.js		2024-05-20 23:57:04 +02:00
..
chewy	Clamp dates when serializing to Elasticsearch API (#28081)	2023-11-27 13:25:54 +00:00
controllers	Merge branch 'refs/heads/glitch-soc' into develop	2024-05-20 23:57:04 +02:00
helpers	Merge commit '12472e7f407c42bcff6ee204b9f1887b5824734f' into glitch-soc/merge-upstream	2024-05-17 12:33:41 +02:00
javascript	Merge branch 'refs/heads/glitch-soc' into develop	2024-05-20 23:57:04 +02:00
lib	Merge branch 'refs/heads/glitch-soc' into develop	2024-05-20 23:57:04 +02:00
mailers	Merge branch 'refs/heads/glitch-soc' into develop	2024-05-20 23:57:04 +02:00
models	Merge branch 'refs/heads/glitch-soc' into develop	2024-05-20 23:57:04 +02:00
policies	Merge branch 'refs/heads/glitch-soc' into develop	2024-05-20 23:57:04 +02:00
presenters	Fix repetitive database queries from #30040 (#30259)	2024-05-15 09:38:16 +00:00
serializers	Merge branch 'refs/heads/glitch-soc' into develop	2024-05-20 23:57:04 +02:00
services	Merge branch 'refs/heads/glitch-soc' into develop	2024-05-20 23:57:04 +02:00
validators	Merge branch 'refs/heads/glitch-soc' into develop	2024-05-11 23:31:31 +02:00
views	Merge branch 'refs/heads/glitch-soc' into develop	2024-05-17 15:33:30 +02:00
workers	Merge branch 'refs/heads/glitch-soc' into develop	2024-05-20 23:57:04 +02:00