fix/upstreaming-merge-conflicts #42

Merged
teutat3s merged 26 commits from refs/pull/42/head into main 2021-10-11 22:32:01 +00:00
2 changed files with 2 additions and 0 deletions
Showing only changes of commit 54a9a8366e - Show all commits

View file

@ -3,6 +3,7 @@ on:
push: push:
branches: branches:
- main - main
- master
- trying - trying
- staging - staging
jobs: jobs:

View file

@ -4,6 +4,7 @@ on:
push: push:
branches: branches:
- main - main
- master
jobs: jobs:
deploy: deploy: