ThibG 949b37faba [Glitch] Fix pending upload count not being decremented on error ... Port 667708f5b0 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>		2019-11-30 17:37:16 +01:00
..
core	Merge branch 'master' into glitch-soc/merge-upstream	2019-09-05 11:36:41 +02:00
flavours	[Glitch] Fix pending upload count not being decremented on error	2019-11-30 17:37:16 +01:00
fonts
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 branch 'master' into glitch-soc/merge-upstream	2019-11-30 17:29:44 +01:00
packs	Merge branch 'master' into glitch-soc/merge-upstream	2019-11-06 14:38:28 +01: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-11-30 17:29:44 +01:00