Jeremy Kescher 2df3b9f803 Merge branch 'refs/heads/glitch-soc' into develop ... # Conflicts: # app/serializers/initial_state_serializer.rb		2024-04-11 21:50:48 +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-04-11 21:50:48 +02:00
helpers	Merge commit 'ffc5be4820ed7bad4656489f096230dd7965140b' into glitch-soc/merge-upstream	2024-03-19 19:21:12 +01:00
javascript	Merge branch 'refs/heads/glitch-soc' into develop	2024-04-11 21:50:48 +02:00
lib	Merge branch 'glitch-soc' into develop	2024-03-19 18:31:27 +01:00
mailers	Merge branch 'glitch-soc' into develop	2024-03-14 20:01:30 +01:00
models	Merge branch 'refs/heads/glitch-soc' into develop	2024-04-11 21:50:48 +02:00
policies	Merge branch 'glitch-soc' into develop	2024-01-28 02:29:46 +01:00
presenters	Add annual reports for accounts (#28693)	2024-01-24 09:38:10 +00:00
serializers	Merge branch 'refs/heads/glitch-soc' into develop	2024-04-11 21:50:48 +02:00
services	Merge branch 'refs/heads/glitch-soc' into develop	2024-04-11 21:50:48 +02:00
validators	Add reject pattern to Admin setting (Ported to Glitch Soc)	2024-02-17 18:55:57 +01:00
views	Merge branch 'refs/heads/glitch-soc' into develop	2024-04-11 21:50:48 +02:00
workers	Merge branch 'glitch-soc' into develop	2024-03-14 20:01:30 +01:00