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-10.26 into main #12955

Merged
merged 72 commits into from
May 13, 2024
Merged

Merge release-10.26 into main #12955

merged 72 commits into from
May 13, 2024

Conversation

andrewheard
Copy link
Contributor

Merging the branch for https://github.com/firebase/firebase-ios-sdk/releases/tag/10.26.0 into main.

Notes:

andrewheard and others added 30 commits April 30, 2024 17:37
This reverts commit af7d783.

# Conflicts:
#	FirebaseVertexAI/Sources/VertexAI.swift
#	Package.swift
Co-authored-by: Morgan Chen <morganchen@google.com>
Co-authored-by: Paul Beusterien <paulbeusterien@google.com>
Co-authored-by: Peter Friese <peterfriese@google.com>
Co-authored-by: Ryan Wilson <wilsonryan@google.com>
Co-authored-by: Morgan Chen <morganchen@google.com>
Co-authored-by: Paul Beusterien <paulbeusterien@google.com>
Co-authored-by: Peter Friese <peterfriese@google.com>
Co-authored-by: Ryan Wilson <wilsonryan@google.com>
andrewheard and others added 22 commits May 13, 2024 12:14
Co-authored-by: Paul Beusterien <paulbeusterien@google.com>
@paulb777 paulb777 merged commit 1696c5c into main May 13, 2024
113 checks passed
@paulb777 paulb777 deleted the ah/release-10.26-merge-ca branch May 13, 2024 18:12
@firebase firebase locked and limited conversation to collaborators Jun 13, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants