]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Thu, 14 May 2020 16:49:10 +0000 (18:49 +0200)
committerThibaut Girka <thib@sitedethib.com>
Thu, 14 May 2020 16:49:10 +0000 (18:49 +0200)
commitf94aebafe500c5e967e6a27d45217e1afe67f695
tree1523b1279eb7f90fa1d517d4ba73b2ecaa912686
parente1d282023432ff4a88cb795f3a9889704314e448
parentc9dcc2d39fb5bd945ecd999e50c08a86cce1aa3e
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
app/javascript/styles/mastodon/components.scss
config/locales/ja.yml
config/locales/pl.yml
config/locales/simple_form.ja.yml
lib/mastodon/version.rb