]> cat aescling's git repositories - mastodon.git/commit
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
authorJenkins <jenkins@jenkins.ninjawedding.org>
Wed, 13 Dec 2017 18:17:16 +0000 (18:17 +0000)
committerJenkins <jenkins@jenkins.ninjawedding.org>
Wed, 13 Dec 2017 18:17:16 +0000 (18:17 +0000)
commit82236a37039043d134efb3ddbdd2a3e04e714e2c
treec00cd712a172ac3d5865e94bc505590fa211ecd5
parent65d083338debc256360fd6052ec43b98c442320c
parent72314d26aeef0b225401d3f0ad97ea948c66f423
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
12 files changed:
app/javascript/mastodon/locales/en.json
app/javascript/mastodon/locales/ja.json
app/javascript/styles/mastodon/components.scss
config/locales/ca.yml
config/locales/en.yml
config/locales/fr.yml
config/locales/ja.yml
config/locales/nl.yml
config/locales/pl.yml
config/locales/pt-BR.yml
db/schema.rb
streaming/index.js