beatrix 77b650b69c Merge pull request #412 from ThibG/glitch-soc/cleanup ... Remove duplicate message entries (minor code cleanup)		2018-04-04 11:36:54 -04:00
..
core	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-24 19:17:11 +00:00
flavours	Merge pull request #412 from ThibG/glitch-soc/cleanup	2018-04-04 11:36:54 -04: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 'origin/master' into gs-master	2018-04-01 20:24:50 -05:00
packs	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-03-25 15:17:21 +00: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-30 19:17:17 +00:00