Merge branch 'master' into dependabot/npm_and_yarn/qs-6.11.2

nickevansuk · web-flow · commit a39bbf8d87de · 2023-09-15T15:09:55.000+01:00
diff --git a/.github/workflows/dependabot-automerge.yml b/.github/workflows/dependabot-automerge.yml
@@ -16,7 +16,7 @@ jobs:
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
       - name: Enable auto-merge for Dependabot PRs
-        run: gh pr merge --auto --merge "$PR_URL"
+        run: gh pr merge --auto --squash "$PR_URL"
         env:
           PR_URL: ${{github.event.pull_request.html_url}}
           GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openactive/data-models",
-  "version": "2.0.309",
+  "version": "2.0.311",
   "description": "Data models used to drive that OpenActive validator, developer documentation, and model libraries",
   "homepage": "https://www.openactive.io",
   "author": "OpenActive Community <hello@openactive.io>",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@openactive/data-models",`
`3`		`- "version": "2.0.309",`
	`3`	`+ "version": "2.0.311",`
`4`	`4`	`"description": "Data models used to drive that OpenActive validator, developer documentation, and model libraries",`
`5`	`5`	`"homepage": "https://www.openactive.io",`
`6`	`6`	`"author": "OpenActive Community <hello@openactive.io>",`