]> cat aescling's git repositories - mastodon.git/commitdiff
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
authorJenkins <jenkins@jenkins.ninjawedding.org>
Thu, 7 Dec 2017 00:17:14 +0000 (00:17 +0000)
committerJenkins <jenkins@jenkins.ninjawedding.org>
Thu, 7 Dec 2017 00:17:14 +0000 (00:17 +0000)
1  2 
config/locales/ja.yml

Simple merge