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

Simple merge