4 Commits (58d0a8f79b11c56da1f78bde2b0458e946b8ab12)

Author	SHA1	Message	Date
Claire	085a1197da	Merge commit '21f904b344e57f68dd86b91d7228bdae37e75624' 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	1c298d97c5	Change wording of “Content cache retention period” setting to highlight destructive implications (#23261)	2023-06-02 18:09:08 +02:00
Claire	0060eb5dcf	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-28 19:23:58 +02:00
Eugen Rochko	2130895196	Change settings area to be separated into categories in admin UI (#19407) ... And update all descriptions	2022-10-22 11:44:41 +02:00