Claire 941a9df28a Merge commit '96bcee66fb' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-nightly.yml`: Upstream changed how the nightly builds are versioned, the conflict is because glitch-soc modified adjacent lines relative to the docker repositories the images are pushed to. Applied upstream's changes. - `app/views/settings/preferences/notifications/show.html.haml`: Upstream moved some settings around. Glitch-soc had more settings. Applied upstream's changes, moving glitch-soc's extra settings accordingly.		2023-08-24 21:56:00 +02:00
..
core	Merge commit '1cdcd9dc08' into glitch-soc/merge-upstream	2023-08-24 21:01:19 +02:00
flavours	[Glitch] Change opacity of the delete icon in the search field to be more visible	2023-08-24 21:51:13 +02:00
fonts	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-28 19:23:58 +02:00
hooks	[Proposal] Make able to write React in Typescript (#16210)	2023-04-03 03:31:39 +02:00
icons	png optimization(loss less) (#19630)	2022-11-01 15:06:52 +01:00
images	Merge commit '55e7c08a83' into glitch-soc/merge-upstream	2023-06-25 14:27:38 +02:00
mastodon	Merge commit '96bcee66fb' into glitch-soc/merge-upstream	2023-08-24 21:56:00 +02:00
packs	Merge commit 'bb51c0676d' into glitch-soc/merge-upstream	2023-08-24 20:34:14 +02:00
skins	initial translation of Glitch-specific texts into Czech (#1997)	2022-12-08 10:38:52 +01:00
styles	Merge commit 'e3fd071973' into glitch-soc/merge-upstream	2023-08-24 21:50:14 +02:00
types	Change interaction modal in web UI (#26075)	2023-07-27 16:11:17 +02:00