Jeremy Kescher caccc2e0f4 Merge branch 'glitch-soc' into develop ... # Conflicts: # README.md # app/javascript/flavours/glitch/components/status.jsx # app/javascript/flavours/glitch/features/notifications/components/column_settings.jsx # app/javascript/flavours/glitch/locales/en.json # app/javascript/flavours/glitch/reducers/compose.js # app/javascript/flavours/glitch/styles/components.scss # app/javascript/mastodon/reducers/compose.js # app/models/notification.rb		2024-03-14 20:01:30 +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-03-14 20:01:30 +01:00
helpers	Merge commit 'a32a126cac42c73236236b5a9bd660765b9c58ee' into glitch-soc/merge-upstream	2024-03-13 20:14:18 +01:00
javascript	Merge branch 'glitch-soc' into develop	2024-03-14 20:01:30 +01:00
lib	Merge branch 'glitch-soc' into develop	2024-03-14 20:01:30 +01:00
mailers	Merge branch 'glitch-soc' into develop	2024-03-14 20:01:30 +01:00
models	Merge branch 'glitch-soc' into develop	2024-03-14 20:01:30 +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-03-14 20:01:30 +01:00
services	Merge branch 'glitch-soc' into develop	2024-03-14 20:01:30 +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-03-14 20:01:30 +01:00
workers	Merge branch 'glitch-soc' into develop	2024-03-14 20:01:30 +01:00