ncls7615 a98b0a47ef Merge branch 'master' of https://github.com/glitch-soc/mastodon into glitch-langfiles ... # Conflicts: # app/javascript/glitch/locales/ja.json		2017-12-11 09:43:21 +09:00
..
core	Various fixes	2017-12-04 21:58:10 -08:00
flavours	Merge branch 'master' of https://github.com/glitch-soc/mastodon into glitch-langfiles	2017-12-11 09:43:21 +09:00
fonts	Theme: Windows 95	2017-10-26 23:22:48 -07:00
images	Merge remote-tracking branch 'cybre/theme_win95' into glitch-theme	2017-11-18 15:18:00 -08:00
locales	Javascript intl8n flavour support	2017-12-10 11:08:04 -08:00
mastodon	Merge branch 'master' of https://github.com/glitch-soc/mastodon into glitch-langfiles	2017-12-11 09:43:21 +09:00
packs	Skins support	2017-11-30 19:29:47 -08: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	2017-12-08 13:17:14 +00:00