Merge pull request #7295 from tannewt/fix_mdns_conflict

dhalbert · web-flow · commit 6e40949f6e49 · 2022-12-02T11:13:07.000-05:00
Fix MDNS hostname mangling
diff --git a/.gitmodules b/.gitmodules
@@ -146,7 +146,7 @@
 [submodule "ports/espressif/esp-idf"]
 	path = ports/espressif/esp-idf
 	url = https://github.com/adafruit/esp-idf.git
-	branch = circuitpython8
+	branch = release/v4.4-circuitpython
 [submodule "ports/espressif/certificates/nina-fw"]
 	path = lib/certificates/nina-fw
 	url = https://github.com/adafruit/nina-fw.git
diff --git a/ports/espressif/esp-idf b/ports/espressif/esp-idf
@@ -1 +1 @@
-Subproject commit 26716e006d68e5a584ac29b85d9e2979563fc827
+Subproject commit 20c6d4a623a9391afd0e803b2bbebe020ed15ec8
