13317df fix globalvar.py conflicts

Merged and Committed by robyduck 2 years ago
55 files changed. 1736 lines added. 1029 lines removed.
alt.fedoraproject.org/build/fedimg_vars.py
file modified
+4 -4
alt.fedoraproject.org/data/content/index.html
file modified
+1 -2
alt.fedoraproject.org/data/content/prerelease/index.html
file modified
+28 -26
alt.fedoraproject.org/data/content/verify-prereleases.html
file modified
+2 -3
alt.fedoraproject.org/po/alt.fedoraproject.org.pot
file modified
+378 -356
alt.fedoraproject.org/static/checksums/Fedora-Cloud-27_Beta-1.5-aarch64-CHECKSUM
file added
+21
alt.fedoraproject.org/static/checksums/Fedora-Cloud-27_Beta-1.5-ppc64-CHECKSUM
file added
+21
alt.fedoraproject.org/static/checksums/Fedora-Cloud-27_Beta-1.5-ppc64le-CHECKSUM
file added
+21
alt.fedoraproject.org/static/checksums/Fedora-CloudImages-27_Beta-1.5-aarch64-CHECKSUM
file added
+23
alt.fedoraproject.org/static/checksums/Fedora-CloudImages-27_Beta-1.5-ppc64le-CHECKSUM
file added
+23
alt.fedoraproject.org/static/checksums/Fedora-CloudImages-27_Beta-1.5-x86_64-CHECKSUM
file added
+35
alt.fedoraproject.org/static/checksums/Fedora-Docker-27_Beta-1.5-aarch64-CHECKSUM
file added
+23
alt.fedoraproject.org/static/checksums/Fedora-Docker-27_Beta-1.5-ppc64le-CHECKSUM
file added
+23
alt.fedoraproject.org/static/checksums/Fedora-Docker-27_Beta-1.5-x86_64-CHECKSUM
file added
+23
alt.fedoraproject.org/static/checksums/Fedora-Everything-27_Beta-1.5-aarch64-CHECKSUM
file added
+21
alt.fedoraproject.org/static/checksums/Fedora-Everything-27_Beta-1.5-ppc64-CHECKSUM
file added
+21
alt.fedoraproject.org/static/checksums/Fedora-Everything-27_Beta-1.5-ppc64le-CHECKSUM
file added
+21
alt.fedoraproject.org/static/checksums/Fedora-Everything-27_Beta-1.5-x86_64-CHECKSUM
file added
+21
alt.fedoraproject.org/static/checksums/Fedora-Server-27_Beta-1.5-aarch64-CHECKSUM
file added
+21
alt.fedoraproject.org/static/checksums/Fedora-Server-27_Beta-1.5-ppc64-CHECKSUM
file added
+23
alt.fedoraproject.org/static/checksums/Fedora-Server-27_Beta-1.5-ppc64le-CHECKSUM
file added
+23
alt.fedoraproject.org/static/checksums/Fedora-Server-27_Beta-1.5-x86_64-CHECKSUM
file added
+23
alt.fedoraproject.org/static/checksums/Fedora-Workstation-27_Beta-1.5-x86_64-CHECKSUM
file added
+23
alt.fedoraproject.org/static/css/app.css
file modified
+1 -1
arm.fedoraproject.org/data/content/index.html
file modified
+90 -3
arm.fedoraproject.org/data/content/prerelease.html
file modified
+4 -7
arm.fedoraproject.org/po/arm.fedoraproject.org.pot
file modified
+68 -42
arm.fedoraproject.org/static/checksums/Fedora-Server-27_Beta-1.5-armhfp-CHECKSUM
file added
+21
arm.fedoraproject.org/static/checksums/Fedora-Spins-27_Beta-1.5-armhfp-CHECKSUM
file added
+29
arm.fedoraproject.org/static/checksums/Fedora-Workstation-27_Beta-1.5-armhfp-CHECKSUM
file added
+21
arm.fedoraproject.org/static/images/python.png
file added
+0
build.d/build.py
file modified
+0 -34
build.d/globalvar.py
file modified
+72 -72
getfedora.org/build/release_schedule.py
file modified
+3 -4
getfedora.org/data/content/atomic/download/index.html
file modified
+16 -14
getfedora.org/data/content/atomic/prerelease/index.html
file modified
+9 -1
getfedora.org/data/content/index.html
file modified
+1 -2
getfedora.org/data/content/server/download/index.html
file modified
+5 -1
getfedora.org/data/content/server/prerelease/index.html
file modified
+0 -22
getfedora.org/data/content/workstation/prerelease/index.html
file modified
+6 -26
getfedora.org/po/getfedora.pot
file modified
+173 -187
getfedora.org/static/checksums/Fedora-CloudImages-27-x86_64-20170929.n.0-CHECKSUM
file added
+16
getfedora.org/static/checksums/Fedora-CloudImages-27_Beta-1.5-x86_64-CHECKSUM
file added
+35
getfedora.org/static/checksums/Fedora-Server-27_Beta-1.5-x86_64-CHECKSUM
file added
+23
getfedora.org/static/checksums/Fedora-Workstation-27_Beta-1.5-x86_64-CHECKSUM
file added
+23
labs.fedoraproject.org/data/content/index.html
file modified
+1 -2
labs.fedoraproject.org/data/content/prerelease.html
file modified
+17 -18
labs.fedoraproject.org/po/labs.fedoraproject.org.pot
file modified
+49 -49
labs.fedoraproject.org/static/checksums/Fedora-Labs-27_Beta-1.5-x86_64-CHECKSUM
file added
+33
labs.fedoraproject.org/static/checksums/Fedora-Labs-Vagrant-27_Beta-1.5-x86_64-CHECKSUM
file added
+23
labs.fedoraproject.org/static/images/screenshots/screenshot-python-classroom.jpg
file added
+0
spins.fedoraproject.org/data/content/index.html
file modified
+1 -2
spins.fedoraproject.org/data/content/prerelease.html
file modified
+19 -18
spins.fedoraproject.org/po/spins.fedoraproject.org.pot
file modified
+121 -133
spins.fedoraproject.org/static/checksums/Fedora-Spins-27_Beta-1.5-x86_64-CHECKSUM
file added
+33
    fix globalvar.py conflicts
    
        
empty file added
file modified
+0 -34
file modified
+72 -72
file modified
+173 -187