Thibaut Girka 0afe3c1562 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `yarn.lock`: No real conflict, just a glitch-soc-only dependency textually too close to one updated upstream. Ported upstream changes.		2020-08-01 20:24:23 +02:00
..
core	Merge branch 'master' into glitch-soc/merge-upstream	2020-07-01 19:23:14 +02:00
flavours	Fix custom boost icon colors being swapped	2020-07-24 11:58:09 +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-08-01 20:24:23 +02:00
packs	Fix lock icon not being shown when locking account in profile settings (#14190)	2020-07-01 13:51:50 +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-08-01 20:24:23 +02:00