Jeremy Kescher 009251a17d Merge branch 'glitch-soc' into develop ... # Conflicts: # app/javascript/mastodon/features/ui/components/navigation_panel.jsx # app/javascript/mastodon/initial_state.js # app/serializers/initial_state_serializer.rb # config/initializers/chewy.rb # config/locales/en.yml # config/locales/ja.yml		2024-02-24 19:11:05 +01:00
..
chewy	Clamp dates when serializing to Elasticsearch API (#28081)	2023-11-27 13:25:54 +00:00
controllers	Merge branch 'glitch-soc' into develop	2024-02-24 19:11:05 +01:00
helpers	Merge commit 'aaa58d4807377e04649499ebee91757b16b9a007' into glitch-soc/merge-upstream	2024-02-24 14:27:43 +01:00
javascript	Merge branch 'glitch-soc' into develop	2024-02-24 19:11:05 +01:00
lib	Merge branch 'glitch-soc' into develop	2024-02-24 19:11:05 +01:00
mailers	Merge branch 'glitch-soc' into develop	2024-02-24 11:11:24 +01:00
models	Merge branch 'glitch-soc' into develop	2024-02-24 19:11:05 +01: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 'glitch-soc' into develop	2024-02-24 19:11:05 +01:00
services	Merge branch 'glitch-soc' into develop	2024-02-24 19:11:05 +01:00
validators	Add reject pattern to Admin setting (Ported to Glitch Soc)	2024-02-17 18:55:57 +01:00
views	Merge branch 'glitch-soc' into develop	2024-02-24 19:11:05 +01:00
workers	Merge branch 'glitch-soc' into develop	2024-02-24 11:11:24 +01:00