Claire 198283a188 Merge commit '36452845d78f6c3501af1e39391d06ab88a45a5a' into glitch-soc/backports-4.3 ... Conflicts: - `.env.production.sample`: Upstream added a block of three environment variables, while glitch-soc has a different version of the file overall. Added upstream's changes.		2024-10-16 12:42:12 +02:00
..
__mocks__	…
entrypoints	Merge commit '24ef8255b3f9b44cb54f49bc78fe3382a7070b1a' into glitch-soc/merge-upstream	2024-09-12 20:05:08 +02:00
flavours	[Glitch] Fix reblog icons on account media view	2024-10-15 17:49:40 +02:00
fonts	…
hooks	Update directory page options to use URL params (#31977)	2024-09-19 15:34:08 +00:00
icons	…
images	Merge commit 'e08d22724d9baf6c639466507c2b117788e5b8de' into glitch-soc/merge-upstream	2024-08-22 22:09:10 +02:00
mastodon	Merge commit '36452845d78f6c3501af1e39391d06ab88a45a5a' into glitch-soc/backports-4.3	2024-10-16 12:42:12 +02:00
material-icons	Merge branch 'stable-4.3' into glitch-soc/backports-4.3	2024-10-05 20:45:05 +02:00
skins	…
styles	Merge commit '36452845d78f6c3501af1e39391d06ab88a45a5a' into glitch-soc/backports-4.3	2024-10-16 12:42:12 +02:00
svg-icons	Change zoom icon in web UI (#29683)	2024-09-20 09:42:02 +00:00
types	…