Skip to content

Merge main to oas release#535

Merged
erkkinen merged 33 commits into
oas-releasefrom
merge-main-to-oas-release
May 12, 2026
Merged

Merge main to oas release#535
erkkinen merged 33 commits into
oas-releasefrom
merge-main-to-oas-release

Conversation

@adanilowski-dropbox
Copy link
Copy Markdown
Contributor

@adanilowski-dropbox adanilowski-dropbox commented May 7, 2026

Summary

Sync main into oas-release for SDK release cut.

Changes included

Conflict resolution

  • sdks/python/dropbox_sign/__init__.py — trivial blank line difference, resolved by taking main's version.

jtreminio-dropbox and others added 23 commits June 25, 2025 13:09
Co-authored-by: Juan Treminio <juantreminio@dropbox.com>
Co-authored-by: Juan Treminio <juantreminio@dropbox.com>
Co-authored-by: Juan Treminio <juantreminio@dropbox.com>
…ease

# Conflicts:
#	sdks/python/dropbox_sign/__init__.py
@adanilowski-dropbox adanilowski-dropbox self-assigned this May 7, 2026
@adanilowski-dropbox adanilowski-dropbox marked this pull request as ready for review May 7, 2026 13:37
Copy link
Copy Markdown
Collaborator

@erkkinen erkkinen left a comment

Choose a reason for hiding this comment

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

LGTM

@erkkinen erkkinen merged commit 330e294 into oas-release May 12, 2026
8 checks passed
@erkkinen erkkinen deleted the merge-main-to-oas-release branch May 12, 2026 11:59
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.

8 participants