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

Simple merge
Simple merge