Claire 1c25f35ddf Merge commit '23c3e0985346406f312b88c659cd9fad63cb6060' into glitch-soc/merge-upstream ... Conflicts: - `app/views/settings/preferences/appearance/show.html.haml`: Conflict because glitch-soc does not have a theme selector here.		2023-06-10 18:42:29 +02:00
..
appearance	Merge commit '23c3e0985346406f312b88c659cd9fad63cb6060' into glitch-soc/merge-upstream	2023-06-10 18:42:29 +02:00
notifications	Merge branch 'main' into glitch-soc/merge-upstream	2023-03-31 21:30:27 +02:00
other	Fix default content type setting not applying (#2176)	2023-04-12 20:12:25 +02:00