ThibG ef925f31a6 Merge pull request #1233 from ThibG/glitch-soc/merge-upstream ... Merge upstream changes		2019-10-11 22:28:11 +02:00
..
core	Merge branch 'master' into glitch-soc/merge-upstream	2019-09-05 11:36:41 +02:00
flavours	[Glitch] Fix media editing modal changing dimensions when image loads	2019-10-10 21:00:13 +02:00
fonts	Theme: Windows 95	2018-01-05 16:22:58 -08:00
images	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-10 18:59:53 +02:00
locales	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-01 21:00:16 +01:00
mastodon	Merge pull request #1233 from ThibG/glitch-soc/merge-upstream	2019-10-11 22:28:11 +02:00
packs	Merge branch 'master' into glitch-soc/merge-upstream	2019-09-30 12:23:57 +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	2019-10-10 17:26:08 +02:00