Claire 7782e4dc0d Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/about_controller.rb`: Minor conflict caused by glitch-soc's theming system. Ported upstream changes.		2020-12-10 09:41:49 +01:00
..
core	[Glitch] Change how CDN_HOST is passed down to make assets build reproducible	2020-10-21 21:28:47 +02:00
flavours	[Glitch] Fix column swiping animation logic	2020-12-09 15:12:28 +01:00
fonts	…
images	Merge branch 'master' into glitch-soc/merge-upstream	2020-05-13 22:11:49 +02:00
locales	…
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2020-12-10 09:41:49 +01:00
packs	Merge branch 'master' into glitch-soc/merge-upstream	2020-12-10 09:41:49 +01:00
skins	Glitchsoc translation to 'es' language (#1439)	2020-10-19 22:17:29 +02:00
styles	Merge branch 'master' into glitch-soc/merge-upstream	2020-12-10 09:41:49 +01:00