Thibaut Girka 59e92004b3 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: not a real conflict, upstream update too close to a glitch-soc-specific dependency		2020-06-17 17:10:15 +02:00
..
core	Merge branch 'master' into glitch-soc/merge-upstream	2020-05-03 21:23:49 +02:00
flavours	[Glitch] Fix WebUI crash when loading account data before page is loaded	2020-06-09 11:55:07 +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-06-17 17:10:15 +02:00
packs	Merge branch 'master' into glitch-soc/merge-upstream	2020-05-03 21:23:49 +02:00
skins	Port Sylvhem's mastodon-light to glitch flavour	2018-05-07 17:00:02 +02:00
styles	Merge branch 'master' into glitch-soc/merge-upstream	2020-06-17 17:10:15 +02:00