Uh oh!
There was an error while loading. Please reload this page.
[stable17] Backport #18120 - #18205
Merged
Merged
Conversation
…kend for Sabre/DAV Signed-off-by: Georg Ehrke <developer@georgehrke.com>
georgehrke
commented
Dec 3, 2019
MemberAuthor
@rullzer Is a backport to stable16 necessary? Literally every modified file gave me a conflict while cherry-picking on 16. |
skjnldsv
approved these changes
Dec 3, 2019
rullzer
commented
Dec 4, 2019
Member
@georgehrke ideally yes... big conflicts or? |
rullzer
approved these changes
Dec 4, 2019
georgehrke
commented
Dec 4, 2019
MemberAuthor
Let me try my best. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Backport of #18120