Merge remote-tracking branch 'origin/main'

weblate · weblate · commit 51aa0a3242da · 2022-01-25T20:07:38.000+01:00
diff --git a/.gitmodules b/.gitmodules
@@ -149,7 +149,7 @@
 [submodule "ports/espressif/esp-idf"]
 	path = ports/espressif/esp-idf
 	url = https://github.com/adafruit/esp-idf.git
-	branch = release/v4.4
+	branch = circuitpython-v4.4
 [submodule "ports/espressif/certificates/nina-fw"]
 	path = ports/espressif/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 6db2ebd7897be544ad0f169871db4b13b4c0941e
+Subproject commit 2775b6e213a1876dd1abe4923097ca5b437397e3
