pub-solar/os
5
0
Fork 2
Code Issues 4 Pull requests Packages Projects 1 Releases Wiki Activity

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
Conversation 0 Commits 26 Files changed 10 +2 -2
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 252769ce46 - Show all commits

4
.github/workflows/release.yml vendored
View file

@ -19,7 +19,7 @@ jobs:
- name: Checkout code - name: Checkout code
uses: actions/checkout@v2 uses: actions/checkout@v2
with: with:
ref: core ref: master
- name: Update Changelog - name: Update Changelog
uses: heinrichreimer/github-changelog-generator-action@v2.1.1 uses: heinrichreimer/github-changelog-generator-action@v2.1.1
with: with:
@ -49,7 +49,7 @@ jobs:
- name: Checkout code - name: Checkout code
uses: actions/checkout@v2 uses: actions/checkout@v2
with: with:
ref: core ref: master
- name: Get Changelog Entry - name: Get Changelog Entry
id: changelog_reader id: changelog_reader