David Yip 81e3ec4d61 Merge pull request #488 from ThibG/glitch-soc/features/accounts-custom-emoji ... [Glitch] Enable custom emojis in profiles		2018-05-18 07:55:00 -05:00
..
core	Merge remote-tracking branch 'origin/master' into gs-master	2018-05-03 17:23:44 -05:00
flavours	Merge pull request #488 from ThibG/glitch-soc/features/accounts-custom-emoji	2018-05-18 07:55:00 -05:00
fonts	Theme: Windows 95	2018-01-05 16:22:58 -08:00
images	Merge branch 'master' of https://github.com/tootsuite/mastodon	2018-02-23 23:28:31 +09:00
locales
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2018-05-16 21:52:38 +02:00
packs	Merge branch 'master' into glitch-soc/merge	2018-05-14 20: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	2018-05-14 20:51:50 +02:00