]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'main' into glitch-soc/merge-upstream
authorClaire <claire.github-309c@sitedethib.com>
Sun, 9 May 2021 08:41:28 +0000 (10:41 +0200)
committerClaire <claire.github-309c@sitedethib.com>
Sun, 9 May 2021 08:41:28 +0000 (10:41 +0200)
commit87c3a0d0b3dfd7e3ea818156de38497e6257e78f
treec816a9156bc7f8ca56fa041ba6dbfcc10e0ca97e
parent5233e9910677c921ab93e0997964144b1df95a63
parent9b18914c3572be5b661e4d8e31578fae4ee347be
Merge branch 'main' 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/serializers/rest/account_serializer.rb
lib/mastodon/version.rb