Skip to content

Commit

Permalink
Merge branch 'main' into release-1.2.1
Browse files Browse the repository at this point in the history
# Conflicts:
#	.github/workflows/backend-prod-ci-cd.yml
  • Loading branch information
fromitive committed Oct 24, 2024
2 parents 088dd19 + fceb297 commit 69e9084
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/backend-prod-ci-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ on:
- "backend/**"
- ".github/workflows/backend-prod-ci-cd.yml"
- "Dockerfile"
pull_request:
branches: [ "main" ]
paths:
- "backend/**"
- ".github/workflows/backend-prod-ci-cd.yml"
- "Dockerfile"
pull_request:
branches: [ "main" ]
paths:
- "backend/**"
- ".github/workflows/backend-prod-ci-cd.yml"
- "Dockerfile"

jobs:

Expand Down

0 comments on commit 69e9084

Please sign in to comment.