Skip to content

Commit

Permalink
Merge branch 'master' into joamag/test
Browse files Browse the repository at this point in the history
  • Loading branch information
joamag committed Jul 11, 2023
2 parents b6a69c2 + 2adb1fc commit 2931084
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions .mergify/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ queue_rules:
pull_request_rules:
- name: Default merge
conditions:
- base=master
- base=stable
- and: *common_checks
actions:
queue:
name: default

- name: Hotfix merge
conditions:
- base=master
- base=stable
- label=hotfix
actions:
queue:
Expand Down

0 comments on commit 2931084

Please sign in to comment.