Merge remote-tracking branch 'origin/main' into release/6.1

swift-ci · swift-ci · commit fb0e4940f8cb · 2024-12-19T12:21:13.000-08:00
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -26,4 +26,4 @@
 
 Sources/XCBuildSupport/* @jakepetroules
 
-* @bnbarham @MaxDesiatov @jakepetroules @francescomikulis @xedin @dschaefer2 @shawnhyam @bripeticca @plemarquand @owenv
+* @bnbarham @MaxDesiatov @jakepetroules @francescomikulis @xedin @dschaefer2 @shawnhyam @bripeticca @plemarquand @owenv @bkhouri

Original file line number	Diff line number	Diff line change
`@@ -26,4 +26,4 @@`
`26`	`26`
`27`	`27`	`Sources/XCBuildSupport/* @jakepetroules`
`28`	`28`
`29`		`-* @bnbarham @MaxDesiatov @jakepetroules @francescomikulis @xedin @dschaefer2 @shawnhyam @bripeticca @plemarquand @owenv`
	`29`	`+* @bnbarham @MaxDesiatov @jakepetroules @francescomikulis @xedin @dschaefer2 @shawnhyam @bripeticca @plemarquand @owenv @bkhouri`