External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-01 17:48:10 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'tower/test_stable-2.6' into merge_26_2

Browse Source
This commit is contained in:
AlanCoding
2025-09-04 23:06:53 -04:00
parent 51eb109dbe 7dc4f149a7
commit 8fb6a3a633
127 changed files with 14455 additions and 345 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/label_pr.yml vendored
View File

@@ -33,7 +33,11 @@ jobs:
with:
show-progress: false
<<<<<<< HEAD
- uses: ./.github/actions/setup-python
=======
- uses: actions/setup-python@v5
>>>>>>> tower/test_stable-2.6
with:
python-version: '3.x'