]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Mon, 13 Jan 2020 12:14:35 +0000 (13:14 +0100)
committerThibaut Girka <thib@sitedethib.com>
Mon, 13 Jan 2020 12:14:35 +0000 (13:14 +0100)
commit83f8bf48d91605fa63325b4d4acec717031da025
tree14bcdbeac5f8d904cad3d13a469869c5baf9db99
parent7ab12b7654f04b2ea71cada9c8f0a41825864939
parent3287ec8ca3bf8baad6cea0cc497753ff003d2d35
Merge branch 'master' into glitch-soc/merge-upstream
Gemfile.lock
app/javascript/mastodon/locales/defaultMessages.json
app/javascript/mastodon/locales/ja.json
config/locales/simple_form.ja.yml