prplecake bcb958c264 Merge remote-tracking branch 'mastodon/main' into cit/wip/follow-hashtags		2022-07-30 18:54:55 -05:00
..
core	Merge branch 'main' into glitch-soc/merge-upstream	2022-06-11 00:08:41 +02:00
flavours	Use slightly more margin between post buttons (under compose box) (#1816)	2022-07-27 19:17:15 +02:00
fonts	Theme: Windows 95	2018-01-05 16:22:58 -08:00
icons	Fix wrong aspect ratio of logo in icons (#18639)	2022-06-11 20:32:02 +02:00
images	Merge branch 'main' into glitch-soc/merge-upstream	2022-06-21 08:28:59 +02:00
locales	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-01 21:00:16 +01:00
mastodon	Merge remote-tracking branch 'mastodon/main' into cit/wip/follow-hashtags	2022-07-30 18:54:55 -05:00
packs	Merge branch 'main' into glitch-soc/merge-upstream	2022-06-28 11:11:18 +02:00
skins	Glitchsoc translation to 'es' language (#1439)	2020-10-19 22:17:29 +02:00
styles	Merge branch 'main' into glitch-soc/merge-upstream	2022-07-22 09:58:35 +02:00