]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Thu, 13 Jun 2019 20:23:20 +0000 (22:23 +0200)
committerThibaut Girka <thib@sitedethib.com>
Thu, 13 Jun 2019 20:23:20 +0000 (22:23 +0200)
commit60adda7e591c420469beeb3713f1dfa3bdba7e66
tree1b619d39688418c5582d743e830aea71e66d5782
parent80849812d2a03ff9da671a2204bacf0c85f6ab0d
parentc9eeb2e832b5b36a86028bbec7a353c32be510a7
Merge branch 'master' into glitch-soc/merge-upstream
app/javascript/mastodon/features/compose/components/compose_form.js
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
config/locales/simple_form.pl.yml
lib/mastodon/version.rb