]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Wed, 19 Dec 2018 11:58:49 +0000 (12:58 +0100)
committerThibaut Girka <thib@sitedethib.com>
Wed, 19 Dec 2018 11:58:49 +0000 (12:58 +0100)
commitadd74816a5fd7c46391413a61f06e01f173ea295
treea1f23bd6e496495ea69c1b831359f7770b7e9354
parent655da1be2029cecedcaf86479938d7805e72107d
parentaf56efdec56230eddab711edd33a7e33694f2b34
Merge branch 'master' into glitch-soc/merge-upstream
app/javascript/mastodon/locales/defaultMessages.json
app/javascript/mastodon/locales/en.json
app/javascript/mastodon/locales/ja.json
app/javascript/styles/mastodon/components.scss
config/locales/en.yml
config/locales/ja.yml
config/locales/simple_form.ja.yml
spec/policies/status_policy_spec.rb