David Yip 6a6f680d98 Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master		2018-03-18 20:20:08 -05:00
..
core	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-24 19:17:11 +00:00
flavours	Merge pull request #388 from ThibG/glitch-soc/federated-pinned-toots	2018-03-18 20:17:15 -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	Javascript intl8n flavour support	2017-12-10 11:08:04 -08:00
mastodon	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-03-18 16:17:15 +00:00
packs	Do not require images in about.js and share.js (#6622)	2018-03-04 20:27:40 +01:00
skins/vanilla/win95	Ruby intl8n for themes	2017-12-10 11:08:04 -08:00
styles	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-03-17 17:17:21 +00:00