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

author Thibaut Girka <thib@sitedethib.com>

Mon, 13 Jan 2020 12:14:35 +0000 (13:14 +0100)

committer Thibaut Girka <thib@sitedethib.com>

Mon, 13 Jan 2020 12:14:35 +0000 (13:14 +0100)
author Thibaut Girka <thib@sitedethib.com>
Mon, 13 Jan 2020 12:14:35 +0000 (13:14 +0100)
committer Thibaut Girka <thib@sitedethib.com>
Mon, 13 Jan 2020 12:14:35 +0000 (13:14 +0100)
diff --cc Gemfile.lock
Simple merge
diff --cc app/javascript/mastodon/locales/defaultMessages.json
Simple merge
diff --cc app/javascript/mastodon/locales/ja.json
Simple merge
diff --cc config/locales/simple_form.ja.yml
Simple merge
author	Thibaut Girka <thib@sitedethib.com>
	Mon, 13 Jan 2020 12:14:35 +0000 (13:14 +0100)
committer	Thibaut Girka <thib@sitedethib.com>
	Mon, 13 Jan 2020 12:14:35 +0000 (13:14 +0100)
		1	2
Gemfile.lock	patch \|	diff1 \|	diff2 \|	blob \| history
app/javascript/mastodon/locales/defaultMessages.json	patch \|	diff1 \|	diff2 \|	blob \| history
app/javascript/mastodon/locales/ja.json	patch \|	diff1 \|	diff2 \|	blob \| history
config/locales/simple_form.ja.yml	patch \|	diff1 \|	diff2 \|	blob \| history