Claire 2a8e55b0ee Merge commit '032dfdfb70963ec9dbdad8f40b5056e16680ec86' into glitch-soc/merge-upstream ... Conflicts: - `Vagrantfile`: Upstream bumped a bunch of values, including one that was already bumped by glitch-soc. Took upstream's version. - `lib/paperclip/transcoder.rb`: glitch-soc already had a partial fix for this. Took upstream's version.		2023-08-24 21:46:17 +02:00
..
core	Merge commit 'd38310bed22bdf2be6ef0e49f325715685b74400' into glitch-soc/merge-upstream	2023-08-24 21:01:19 +02:00
flavours	[Glitch] Fix layout of the closed registrations modal	2023-08-24 21:38:08 +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 '3d50947e62272e3da4365e0b751e4e45c1d9bac6' into glitch-soc/merge-upstream	2023-06-25 14:27:38 +02:00
mastodon	Merge commit '032dfdfb70963ec9dbdad8f40b5056e16680ec86' into glitch-soc/merge-upstream	2023-08-24 21:46:17 +02:00
packs	Merge commit 'fa6b30b2f9bd6cc12ec0a0278d27d748091208cd' 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 '032dfdfb70963ec9dbdad8f40b5056e16680ec86' into glitch-soc/merge-upstream	2023-08-24 21:46:17 +02:00
types	Change interaction modal in web UI (#26075)	2023-07-27 16:11:17 +02:00