Fix merge conflicts and merge develop

amidaware · Jul 5, 2023 · cbc5c1f · cbc5c1f
2 parents a2f259b + 346670e
commit cbc5c1f
Show file tree

Hide file tree

Showing 3 changed files with 317 additions and 5,549 deletions.
diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml
@@ -15,7 +15,7 @@ jobs:
 
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
 
       - run: touch env-config.js
 
@@ -32,4 +32,3 @@ jobs:
         uses: softprops/action-gh-release@v1
         with:
           files: trmm-web-${{github.ref_name}}.tar.gz
-