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

Updating subtree to apollo-ios main #60

Merged
merged 72 commits into from
Oct 5, 2023
Merged

Updating subtree to apollo-ios main #60

merged 72 commits into from
Oct 5, 2023

Conversation

BobaFetters
Copy link
Member

Updating the apollo-ios subtree to the main branch from that repo one more time in preparation for launch.

calvincestari and others added 30 commits May 30, 2023 16:57
Co-authored-by: Zach FettersMoore <4425109+BobaFetters@users.noreply.github.com>
# Conflicts:
#	Sources/ApolloCodegenLib/Templates/SelectionSetTemplate.swift
Co-authored-by: Zach FettersMoore <4425109+BobaFetters@users.noreply.github.com>
Co-authored-by: Stephen Barlow <stephen@apollographql.com>
…ration (#3125)

Co-authored-by: Calvin Cestari <calvincestari@users.noreply.github.com>
BobaFetters and others added 23 commits August 10, 2023 13:44
Co-authored-by: Zach FettersMoore <4425109+BobaFetters@users.noreply.github.com>
Co-authored-by: Alex Deem <alex@teamdeem.com>
Co-authored-by: Jeff Auriemma <bignimbus@users.noreply.github.com>
Co-authored-by: Anthony Miller <anthonymdev@gmail.com>
Co-authored-by: Martin Bonnin <martin@mbonnin.net>
Co-authored-by: Arik Devens <adevens@netflix.com>
Co-authored-by: Calvin Cestari <calvincestari@users.noreply.github.com>
@BobaFetters BobaFetters self-assigned this Oct 5, 2023
Copy link
Member

@calvincestari calvincestari left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @BobaFetters!

@BobaFetters BobaFetters merged commit d10435f into main Oct 5, 2023
11 checks passed
@BobaFetters BobaFetters deleted the update-to-main branch October 5, 2023 16:10
BobaFetters added a commit that referenced this pull request Oct 5, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.