Merge branch 'master' into p384_merge

awslabs · Dec 11, 2023 · 332a6ed · 332a6ed
2 parents 58e4b46 + 41b0f65
commit 332a6ed
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,7 +1,7 @@
 [submodule "src"]
 	path = src
-	branch = upstream-merge-2023-11-30
-	url = https://github.com/dkostic/aws-lc.git
+	branch = main
+	url = https://github.com/aws/aws-lc.git
 [submodule "cryptol-specs"]
 	path = cryptol-specs
 	branch = sha-imperative

diff --git a/src b/src