Merge branch 'master' into glitch-soc/merge-upstream

author Thibaut Girka <thib@sitedethib.com>

Wed, 13 Mar 2019 20:35:43 +0000 (21:35 +0100)

committer Thibaut Girka <thib@sitedethib.com>

Wed, 13 Mar 2019 20:35:43 +0000 (21:35 +0100)
author Thibaut Girka <thib@sitedethib.com>
Wed, 13 Mar 2019 20:35:43 +0000 (21:35 +0100)
committer Thibaut Girka <thib@sitedethib.com>
Wed, 13 Mar 2019 20:35:43 +0000 (21:35 +0100)
diff --cc app/javascript/mastodon/locales/defaultMessages.json
Simple merge
diff --cc app/javascript/mastodon/locales/en.json
Simple merge
diff --cc app/javascript/mastodon/locales/ja.json
Simple merge
diff --cc config/locales/ja.yml
Simple merge
author	Thibaut Girka <thib@sitedethib.com>
	Wed, 13 Mar 2019 20:35:43 +0000 (21:35 +0100)
committer	Thibaut Girka <thib@sitedethib.com>
	Wed, 13 Mar 2019 20:35:43 +0000 (21:35 +0100)
		1	2
app/javascript/mastodon/locales/defaultMessages.json	patch \|	diff1 \|	diff2 \|	blob \| history
app/javascript/mastodon/locales/en.json	patch \|	diff1 \|	diff2 \|	blob \| history
app/javascript/mastodon/locales/ja.json	patch \|	diff1 \|	diff2 \|	blob \| history
config/locales/ja.yml	patch \|	diff1 \|	diff2 \|	blob \| history