Merge branch 'master' into fix/11982

Budibase · Oct 6, 2023 · 484e013 · 484e013
2 parents 239aba9 + ae2cd24
commit 484e013
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.github/workflows/deploy-featurebranch.yml b/.github/workflows/deploy-featurebranch.yml
@@ -4,6 +4,7 @@ on:
   pull_request:
     branches:
       - develop
+      - master
 
 jobs:
   release:

diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.11.10",
+  "version": "2.11.11",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,7 @@ on: @@
       pull_request:
         branches:
           - develop
+          - master
     jobs:
       release:
@@ Expand Down @@