4 Commits (a56c71faba737c0e862319ae4d3b882b0be2aa4f)

Author	SHA1	Message	Date
Claire	85558a5e18	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Minor upstream change, our README is completely different. Kept ours. - `lib/tasks/assets.rake`: glitch-soc has extra code to deal with its theming system, upstream changed a line that exists in glitch-soc. Applied upstream changes.	2023-02-09 12:46:12 +01:00
Eugen Rochko	8f590b0a21	Add setting for status page URL (#23390)	2023-02-04 04:56:06 +01: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