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
..
glitch	Merge branch 'master' of https://github.com/glitch-soc/mastodon into glitch-langfiles	2017-12-11 09:43:21 +09:00
vanilla	Javascript intl8n flavour support	2017-12-10 11:08:04 -08:00