Sync 4.x with master #5529
Draft
Sync 4.x with master #5529
Conversation
This file contains 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
Co-authored-by: Jon Church <me@jonchurch.com> Co-authored-by: Blake Embrey <hello@blakeembrey.com>
Co-authored-by: Wes Todd <wes@wesleytodd.com>
Co-authored-by: Wes Todd <wes@wesleytodd.com>
Co-authored-by: Chris de Almeida <ctcpip@users.noreply.github.com>
Co-authored-by: Chris de Almeida <ctcpip@users.noreply.github.com>
Co-authored-by: Chris de Almeida <ctcpip@users.noreply.github.com>
* docs: add Threat Model * docs: update reference Co-authored-by: Chris de Almeida <ctcpip@users.noreply.github.com> * docs: improve readability Co-authored-by: Chris de Almeida <ctcpip@users.noreply.github.com> * docs: add reference to the Threat Model --------- Co-authored-by: Chris de Almeida <ctcpip@users.noreply.github.com>
PR-URL: #5433 --------- Co-authored-by: Íñigo Marquínez Prado <25435858+inigomarquinez@users.noreply.github.com>
Co-authored-by: Mert Can Altin <mert.altin@trendyol.com>
* doc: updated readme file * doc: updated readme file for doc lint * Update Readme.md Co-authored-by: krzysdz <krzysdz@users.noreply.github.com> * Update Readme.md Co-authored-by: Ulises Gascón <ulisesgascongonzalez@gmail.com> * Update Readme.md Co-authored-by: Ulises Gascón <ulisesgascongonzalez@gmail.com> * Update Readme.md Co-authored-by: Christine Belzie <105683440+CBID2@users.noreply.github.com> * repair readme * added Emeritus area * Add @carpasse to the triager team * removed old collaborators * add missing triagers * lint * Update Readme.md Co-authored-by: Jon Church <me@jonchurch.com> * Update Readme.md Co-authored-by: Jon Church <me@jonchurch.com> * dedent to fix ToC spacing * fixup! dedent to fix ToC spacing * us @ for jonchurch * format names to use github handles first, single line * added emeritus triagers * edited title * added emeritus team members * added menu head * edited emeritus * Update Readme.md Co-authored-by: Jon Church <me@jonchurch.com> * Update Readme.md Co-authored-by: Jon Church <me@jonchurch.com> * edits to TC and anchors * Update Readme.md Co-authored-by: Jon Church <me@jonchurch.com> * Update Readme.md Co-authored-by: Jon Church <me@jonchurch.com> * Update Readme.md Co-authored-by: Jon Church <me@jonchurch.com> * Update Readme.md Co-authored-by: Jon Church <me@jonchurch.com> * Update Readme.md Co-authored-by: Jon Church <me@jonchurch.com> * Update Readme.md Co-authored-by: Ulises Gascón <ulisesgascongonzalez@gmail.com> * Update Readme.md Co-authored-by: Ulises Gascón <ulisesgascongonzalez@gmail.com> * Update Readme.md Co-authored-by: Ulises Gascón <ulisesgascongonzalez@gmail.com> * Update Readme.md Co-authored-by: Ulises Gascón <ulisesgascongonzalez@gmail.com> * Update Readme.md Co-authored-by: Ulises Gascón <ulisesgascongonzalez@gmail.com> --------- Co-authored-by: Mert Can Altin <mert.altin@trendyol.com> Co-authored-by: krzysdz <krzysdz@users.noreply.github.com> Co-authored-by: Ulises Gascón <ulisesgascongonzalez@gmail.com> Co-authored-by: Christine Belzie <105683440+CBID2@users.noreply.github.com> Co-authored-by: Jon Church <me@jonchurch.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Edit: actually this should just be a FF merge, or this PR should be completed with a rebase if we have that enabled in github
It looks like the 4.x branch was last updated with 4.17.2
Merging master in while it's at 4.18.3 syncs it back to where it should be
(should be according to the current release guide and the proposed updated one)