Merge branch 'dev' into issue/OSOE-815

Lombiq · Dec 25, 2024 · 73aa4f8 · 73aa4f8
2 parents ffb6f3d + a81093a
commit 73aa4f8
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -23,7 +23,6 @@ jobs:
       dotnet-test-process-timeout: 600000
       build-enable-nuget-caching: 'true'
       build-enable-npm-caching: 'true'
-      cancel-in-progress-for-this-pr: 'false'
 
   build-and-test-standard-runners:
     if: github.ref_name == github.event.repository.default_branch
@@ -47,7 +46,6 @@ jobs:
       build-directory: NuGetTest
       timeout-minutes: 20
       dotnet-test-process-timeout: 480000
-      cancel-in-progress-for-this-pr: 'false'
 
   spelling:
     name: Spelling

diff --git a/src/Modules/Lombiq.ChartJs b/src/Modules/Lombiq.ChartJs
diff --git a/src/Modules/Lombiq.ContentEditors b/src/Modules/Lombiq.ContentEditors