Skip to content

Conversation

jamesdaniels
Copy link
Member

Merge conflict during the war of the release candidates, accidentally wiped out #2640. Bring it back!

@google-cla google-cla bot added the cla: yes label Nov 18, 2020
@jamesdaniels jamesdaniels merged commit 22e2883 into master Nov 19, 2020
@jamesdaniels jamesdaniels deleted the fix_afs_doc_type branch November 19, 2020 00:12
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.

2 participants