Merge branch 'main' into 0_15

Aircoookie · Jun 29, 2024 · b8b1188 · b8b1188
2 parents 0ff4016 + 3615ab5
commit b8b1188
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,5 @@
 ## WLED changelog
 
-#### Build 2405180
-
 #### Build 2406290
 -   WLED 0.15.0-b4 release
 -   LED settings bus management update (WARNING only allow available outputs)
@@ -40,8 +38,10 @@
     - reduces code by 1kB
 
 #### Build 2405180
+-   WLED 0.14.4 release
+-   Fix for #3978
 -   Official 0.15.0-b3 release
--   Merge 0.14.3 fixes
+-   Merge 0.14.3 fixes into 0_15
 -   Added Pinwheel Expand 1D->2D effect mapping mode (#3961 by @Brandon502)
 -   Add changeable i2c address to BME280 usermod (#3966 by @LordMike)
 -   Effect: Firenoise - add palette selection

diff --git a/requirements.txt b/requirements.txt
@@ -42,7 +42,7 @@ pyelftools==0.29
     # via platformio
 pyserial==3.5
     # via platformio
-requests==2.31.0
+requests==2.32.0
     # via platformio
 semantic-version==2.10.0
     # via platformio
@@ -54,7 +54,7 @@ tabulate==0.9.0
     # via platformio
 typing-extensions==4.11.0
     # via starlette
-urllib3==1.26.18
+urllib3==1.26.19
     # via requests
 uvicorn==0.20.0
     # via platformio