partial merge of upstream/main

* leaving out DotStarHspi5MhzMethod, as we are still on NPB 2.6.9 for eth boards
* leaving out the index.css/index.css changes, as I'm not sure how to merge this.

@ewoudwijma we need to merge the JS and CSS parts when you are back; I'll stay with our MM version for now.
This commit is contained in:
Frank
2023-04-14 19:53:04 +02:00
parent ee23827fdb
commit cc9a19bc1d
9 changed files with 16 additions and 16 deletions

4
package-lock.json generated
View File

@@ -1,12 +1,12 @@
{
"name": "wled",
"version": "0.14.0-b15.22",
"version": "0.14.0-b15.23",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "wled",
"version": "0.14.0-b15.22",
"version": "0.14.0-b15.23",
"license": "ISC",
"dependencies": {
"clean-css": "^4.2.3",