]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Tue, 5 Mar 2019 23:03:46 +0000 (00:03 +0100)
committerThibaut Girka <thib@sitedethib.com>
Tue, 5 Mar 2019 23:03:46 +0000 (00:03 +0100)
commitf108c6a042503e0da7a29dc273340c6ce23e9f8f
tree5eddf53543d0e2e1a5fb7c4f441d8e223440f1f8
parentff827c1f38e91f2ef0ac3ee1c92f0f8a1a3cbdfa
parentefd0fb80880171b1f027b6d0dbd8ace999857062
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/mastodon/locales/pl.json
config/locales/es.yml
config/locales/ja.yml
config/locales/oc.yml