Skip to content

Commit

Permalink
Merge branch 'v7-develop' into security-update
Browse files Browse the repository at this point in the history
  • Loading branch information
JValtteri committed Sep 24, 2024
2 parents 5c4a2b2 + 4d12a46 commit cc02f3b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/backend_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: Backend Unit Test Run

on:
push:
branches: [develop, master]
branches: [develop, 'v**-develop', master]
pull_request:
branches: [develop, master]
branches: [develop, 'v**-develop', master]

jobs:
build:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/frontend_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: Frontend Unit Test Run

on:
push:
branches: [develop, master]
branches: [develop, 'v**-develop', master]
pull_request:
branches: [develop, master]
branches: [develop, 'v**-develop', master]

jobs:
build:
Expand Down

0 comments on commit cc02f3b

Please sign in to comment.