fix/upstreaming-merge-conflicts #41

Merged
teutat3s merged 19 commits from refs/pull/41/head into main 2021-10-11 22:11:36 +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:
branches:
- main
- master
- trying
- staging
jobs:

View file

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