fef 57b7968504 merge nyastodon-specific changes back in ... This was caused by an accidental rebase that i "fixed" by force-pushing, which caused nyastodon to be even with glitch-soc/main. oops.		2022-12-01 23:23:12 +00:00
..
core	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-28 19:49:42 +02:00
flavours	merge nyastodon-specific changes back in	2022-12-01 23:23:12 +00:00
fonts	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-28 19:23:58 +02:00
icons	png optimization(loss less) (#19630)	2022-11-01 15:06:52 +01:00
images	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-12 13:28:03 +01:00
locales	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-01 21:00:16 +01:00
mastodon	merge nyastodon-specific changes back in	2022-12-01 23:23:12 +00:00
packs	Support for import/export of instance-level domain blocks/allows for 4.x w/ additional fixes (#20597)	2022-11-17 11:05:09 +01:00
skins	rewrite homogay flavour	2022-11-16 03:55:56 +00:00
styles	merge catstodon/main into main	2022-11-30 16:35:05 +00:00