]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Sat, 25 Jan 2020 15:50:24 +0000 (16:50 +0100)
committerThibaut Girka <thib@sitedethib.com>
Sat, 25 Jan 2020 15:50:24 +0000 (16:50 +0100)
commit27ddcddcd35f2be10fbdcde572182f3e5f04e00b
tree24ad08c27cbd7fb2352622f2195935259e027337
parent340cb4a04c94f9403673d59e552be909fce25ece
parent48c55b6392661cde8e28cf076c3d132c22d17a0f
Merge branch 'master' into glitch-soc/merge-upstream
app/javascript/mastodon/locales/defaultMessages.json
app/javascript/mastodon/locales/ja.json
app/javascript/styles/mastodon/components.scss
config/locales/ja.yml
config/locales/simple_form.ja.yml