tree 26033ca50318eb053aff7bdd8d567c0ac5ccc3c6
parent 9fa439351c767b81c631e4e89ee31abcb2f0579f
parent f4ff5018df42fa6c565a55574e22ed40d6c7134e
author Jason Lunn <jason.lunn@gmail.com> 1704319623 -0500
committer Jason Lunn <jason.lunn@gmail.com> 1704319623 -0500

Merge remote-tracking branch 'upstream/main' into fix_jruby_proto3_optional

# Conflicts:
#	ruby/tests/stress.rb