Jeremy Kescher bad37d4102 Merge remote-tracking branch 'upstream/main' ... # Conflicts: # public/android-chrome-192x192.png # public/apple-touch-icon.png # public/browserconfig.xml # public/favicon.ico # public/mstile-150x150.png		2022-06-13 23:47:34 +02:00
..
core	Merge branch 'main' into glitch-soc/merge-upstream	2022-06-11 00:08:41 +02:00
flavours	Merge remote-tracking branch 'upstream/main'	2022-06-13 23:47:34 +02:00
fonts	Theme: Windows 95	2018-01-05 16:22:58 -08:00
icons	Change brand color and logotypes (#18592)	2022-06-09 22:25:23 +02:00
images	Merge branch 'main' into glitch-soc/merge-upstream	2022-06-11 00:08:41 +02:00
locales	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-01 21:00:16 +01:00
mastodon	Merge remote-tracking branch 'upstream/main'	2022-06-10 23:11:12 +02:00
packs	Change brand color and logotypes (#18592)	2022-06-09 22:25:23 +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-06-11 00:08:41 +02:00