]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Thu, 6 Feb 2020 20:36:38 +0000 (21:36 +0100)
committerThibaut Girka <thib@sitedethib.com>
Thu, 6 Feb 2020 20:36:38 +0000 (21:36 +0100)
commit1a54b9b99e85e9d6b3c52bfe654659019960eb24
tree33fe0d6c546dade46cf7842959feff686db4f909
parentccaefd139d33f2f0bf4d097131bcf91960bee956
parentaeb6efbb03cd98c0425d094677fc748e0c36c240
Merge branch 'master' into glitch-soc/merge-upstream
app/helpers/accounts_helper.rb
app/javascript/mastodon/locales/ja.json
app/javascript/mastodon/locales/pl.json
app/javascript/packs/public.js
app/serializers/rest/status_serializer.rb
config/locales/en.yml
config/locales/ja.yml
config/locales/simple_form.ja.yml