Thibaut Girka 9c34090db8 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/services/process_mentions_service.rb`: glitch-soc local-only handling, ported upstream changes		2020-10-26 15:48:16 +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 strings that could not be translated	2020-10-21 21:49:46 +02:00
fonts	Theme: Windows 95	2018-01-05 16:22:58 -08:00
images	Merge branch 'master' into glitch-soc/merge-upstream	2020-05-13 22:11:49 +02:00
locales	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-01 21:00:16 +01:00
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2020-10-26 15:48:16 +01:00
packs	[Glitch] Change how CDN_HOST is passed down to make assets build reproducible	2020-10-21 21:28:47 +02: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-10-21 19:10:50 +02:00