void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-09-06 20:13:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix conflict

Browse source
This commit is contained in:
0FL01 2025-07-23 12:03:54 +03:00
parent 53390a1f23
commit 80e60ede1a
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.github/workflows/flatpak-build.yml vendored
View file

@ -31,6 +31,7 @@ jobs:
git checkout dev git checkout dev
echo "Слияние изменений из upstream/dev..." echo "Слияние изменений из upstream/dev..."
git merge upstream/dev --no-edit git merge upstream/dev --no-edit
git pull --rebase origin dev
git push origin dev git push origin dev
- name: Get latest version and create release tag - name: Get latest version and create release tag