]> cat aescling's git repositories - mastodon.git/commit
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
authorDavid Yip <yipdw@member.fsf.org>
Tue, 12 Dec 2017 08:54:13 +0000 (02:54 -0600)
committerDavid Yip <yipdw@member.fsf.org>
Tue, 12 Dec 2017 08:54:13 +0000 (02:54 -0600)
commita057ed5cfea2c1c4fb21984cadae993740fb25e0
treec965f135b8c46f679eb22e80a37550c8b985b9ea
parent04eaa1943f002865f8a0234e19c6ea4cc1d3bb6a
parent14c4a33cd9bfc1212cb362897272e5ea7d1529e5
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
12 files changed:
app/javascript/mastodon/locales/en.json
app/javascript/mastodon/locales/ja.json
app/javascript/styles/mastodon/components.scss
app/models/account.rb
app/views/stream_entries/_detailed_status.html.haml
app/views/tags/show.html.haml
config/application.rb
config/locales/en.yml
config/locales/fr.yml
config/locales/ja.yml
config/routes.rb
db/schema.rb