chore: merge changelog

eggjs · Dec 31, 2023 · 338a7c6 · 338a7c6
1 parent d11096d
commit 338a7c6
Show file tree

Hide file tree

Showing 5 changed files with 739 additions and 833 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
@@ -2,10 +2,10 @@ name: CI
 
 on:
   push:
-    branches: [ master, 5.x ]
+    branches: [ 5.x ]
 
   pull_request:
-    branches: [ master, 5.x ]
+    branches: [ 5.x ]
 
 jobs:
   Job: