]> cat aescling's git repositories - mastodon.git/commit
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
authorJenkins <jenkins@jenkins.ninjawedding.org>
Wed, 3 Jan 2018 20:17:13 +0000 (20:17 +0000)
committerJenkins <jenkins@jenkins.ninjawedding.org>
Wed, 3 Jan 2018 20:17:13 +0000 (20:17 +0000)
commitfc884d015a1a2d6c31976af3d63039390fa15939
tree0cb950fd716f3f2cb9f13348cf42fb6e4bc8b909
parent933840bebf4ce8f5282c88e8c3e8c1b3675fbf2d
parentd907d4352e9b6cb22bc1fabd42ca3fc60aef8a37
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
app/javascript/mastodon/locales/defaultMessages.json
app/javascript/mastodon/locales/en.json
app/javascript/mastodon/locales/ja.json
app/views/accounts/_header.html.haml
config/locales/ja.yml
config/locales/pl.yml
config/routes.rb
spec/models/follow_request_spec.rb