merged and resolved conflict

This commit is contained in:
Alysia Broddrick 2023-06-15 16:44:18 -07:00
commit b6926537d8
No known key found for this signature in database
GPG key ID: 03917052CD0F06B7
17 changed files with 463 additions and 200 deletions

View file

@ -17,6 +17,7 @@ jobs:
|| startsWith(github.head_ref, 'ab/')
|| startsWith(github.head_ref, 'bl/')
|| startsWith(github.head_ref, 'rjm/')
|| startsWith(github.head_ref, 'rb/')
|| startsWith(github.head_ref, 'ko/')
|| startsWith(github.head_ref, 'gd/')
outputs:

View file

@ -15,6 +15,7 @@ on:
options:
- stable
- gd
- rb
- ko
- ab
- bl

View file

@ -16,6 +16,7 @@ on:
options:
- stable
- gd
- rb
- ko
- ab
- bl