]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Wed, 13 Mar 2019 20:35:43 +0000 (21:35 +0100)
committerThibaut Girka <thib@sitedethib.com>
Wed, 13 Mar 2019 20:35:43 +0000 (21:35 +0100)
commit5ffdc5426eb6394ae9e92411a0433aa2dd52d0b0
tree6a4c3f86a82261b2d418626ec2b720bc1c09eddb
parent3005e473a0df4d2ea942dcc33e01c5e4c15b81fa
parent65d9004ac90209a035e2f103e271986ff8650410
Merge branch 'master' into glitch-soc/merge-upstream
app/javascript/mastodon/locales/defaultMessages.json
app/javascript/mastodon/locales/en.json
app/javascript/mastodon/locales/ja.json
config/locales/ja.yml