Skip to content

Commit

Permalink
Merge tag 'refs/tags/sync-piper' into sync-stage
Browse files Browse the repository at this point in the history 
# Conflicts:
#	src/google/protobuf/arena.cc
#	src/google/protobuf/compiler/java/enum_field_lite.cc
  • Loading branch information
@mkruskal-google
mkruskal-google committed Sep 23, 2022
2 parents f9788da + 0f690f1 commit 83b8f07
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 83b8f07

Please sign in to comment.