Claire 2126812f65 Merge commit 'd9c21293aa6e105cedeff6b5e469af40a20909d9' into glitch-soc/merge-upstream ... Conflicts: - `app/views/settings/preferences/other/show.html.haml`: Upstream moved some settings, where glitch-soc has an extra setting. Ported upstream changes, moving the same settings as them.		2023-08-22 18:31:28 +02:00
..
core	Fix interaction modal being broken because of glitch-soc's theming system	2023-07-30 16:45:50 +02:00
flavours	Remove leftover .orig files that were mistakenly included (#2379)	2023-08-22 18:24:03 +02:00
fonts
hooks
icons
images
mastodon	Merge commit 'd9c21293aa6e105cedeff6b5e469af40a20909d9' into glitch-soc/merge-upstream	2023-08-22 18:31:28 +02:00
packs	Merge commit '3a4d3e9d4b573c400eec1743471d54cdccae50a5' into glitch-soc/merge-upstream	2023-08-12 09:36:38 +02:00
skins
styles	Merge commit 'd9c21293aa6e105cedeff6b5e469af40a20909d9' into glitch-soc/merge-upstream	2023-08-22 18:31:28 +02:00
types	Change interaction modal in web UI (#26075)	2023-07-27 16:11:17 +02:00