Skip to content

Update startup.rs (#19)#3

Open
kristiankielhofner wants to merge 18 commits into
toverainc:mainfrom
npuichigo:main
Open

Update startup.rs (#19)#3
kristiankielhofner wants to merge 18 commits into
toverainc:mainfrom
npuichigo:main

Conversation

@kristiankielhofner

Copy link
Copy Markdown

@stintel - Thoughts?

@stintel

stintel commented Jan 22, 2024

Copy link
Copy Markdown
Collaborator

Took me a while to figure out the PR is straight from the original project's main branch. This means any new commit there will end up in this PR as long as it's open. The new commit to update to axum 0.7 conflicts with 92d0ccb. We can revert ours and take the upstream commit, but we should probably consider what we want to do in the future. Backporting upstream changes is going to become harder with every change we make.

@stintel stintel force-pushed the main branch 2 times, most recently from a78d41b to bc014f2 Compare February 16, 2024 11:58
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.

7 participants