Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge release branch #7590

Merged
merged 4 commits into from
Jun 2, 2020
Merged

Conversation

haberman
Copy link
Member

@haberman haberman commented Jun 2, 2020

No description provided.

haberman and others added 4 commits May 28, 2020 10:56
Support the old field name as well as the union to keep the old generated code
building.

Fixes protocolbuffers#7555
)

* Updated version to 3.12.3 and updated CHANGES.txt.

* Re-ran generate_descriptor_protos.sh and made it more parallel.
@haberman haberman merged commit 31ebe2a into protocolbuffers:master Jun 2, 2020
@haberman haberman deleted the merge-release-branch branch December 6, 2020 20:27
bithium pushed a commit to bithium/protobuf that referenced this pull request Sep 4, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants