4 Commits (efbc8cba17a680ac983b64236b030f814b27ab2c)

Author	SHA1	Message	Date
Claire	d8b0a732aa	Merge commit '1483a3ddfe74e4fb81d87447a1781943eab86c60' into glitch-soc/merge-upstream ... Conflicts: - `config/initializers/simple_form.rb`: Upstream added a new simple_form component, where we had an extra one. Kept both components.	2023-06-10 16:22:14 +02:00
Claire	94329f28e1	Change wording of “Content cache retention period” setting to highlight destructive implications (#23261)	2023-06-02 18:09:08 +02:00
Claire	cb19be67d1	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-28 19:23:58 +02:00
Eugen Rochko	7c152acb2c	Change settings area to be separated into categories in admin UI (#19407) ... And update all descriptions	2022-10-22 11:44:41 +02:00