]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'main' into glitch-soc/merge-upstream
authorClaire <claire.github-309c@sitedethib.com>
Mon, 17 May 2021 08:30:34 +0000 (10:30 +0200)
committerClaire <claire.github-309c@sitedethib.com>
Mon, 17 May 2021 08:30:34 +0000 (10:30 +0200)
commit69737b703ab1d9b9e49315f12c3aca8cf6df70ac
treefd533bcafe02475fbc19681cc764d75fe6f16e12
parent678e07c54485c6cc61b2ac18aa5ceaa290a6fcbd
parent4c7efdba402b6b8ee0363b6f1dc2c202303d7623
Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `README.md`: our READMEs are entirely different and
  upstream's has been updated. Kept our README.
CONTRIBUTING.md
Vagrantfile
app/javascript/mastodon/locales/ja.json
app/serializers/activitypub/note_serializer.rb
lib/mastodon/version.rb