6a69ad2 Merge branch 'master' of pagure.io:fedora-websites

Merged and Committed by Rick Elrod 19 days ago
25 files changed. 25 lines added. 196 lines removed.
alt.fedoraproject.org/build/fedimg_vars.py
file modified
+0 -8
alt.fedoraproject.org/data/content/alt/index.html
file modified
+3 -3
alt.fedoraproject.org/static/css/app.css
file modified
+10 -2
build.d/globalvar.py
file modified
+2 -1
labs.fedoraproject.org/data/content/index.html
file modified
+4 -97
labs.fedoraproject.org/static/css/bootstrap.css
file modified
+1 -81
labs.fedoraproject.org/static/images/comp-neuro-banner.png
file modified
+0 -0
spins.fedoraproject.org/static/images/kde/amarok.png
file modified
+0 -0
spins.fedoraproject.org/static/images/kde/dragonplayer.png
file modified
+0 -0
spins.fedoraproject.org/static/images/kde/k3b.png
file modified
+0 -0
spins.fedoraproject.org/static/images/kde/kaffeine.png
file modified
+0 -0
spins.fedoraproject.org/static/images/kde/kalzium.png
file modified
+0 -0
spins.fedoraproject.org/static/images/kde/kiten.png
file modified
+0 -0
spins.fedoraproject.org/static/images/kde/konqueror.png
file modified
+0 -0
spins.fedoraproject.org/static/images/kde/konsole.png
file modified
+0 -0
spins.fedoraproject.org/static/images/kde/kontact.png
file modified
+0 -0
spins.fedoraproject.org/static/images/kde/kopete.png
file modified
+0 -0
spins.fedoraproject.org/static/images/kde/ktorrent.png
file modified
+0 -0
spins.fedoraproject.org/static/images/kde/marble.png
file modified
+0 -0
spins.fedoraproject.org/static/images/kde/network.png
file modified
+0 -0
spins.fedoraproject.org/static/images/kde/parley.png
file modified
+0 -0
spins.fedoraproject.org/static/images/kde/settings.png
file modified
+0 -0
spins.fedoraproject.org/static/images/kde/telepathy.png
file modified
+0 -0
spins.fedoraproject.org/static/images/screenshots/screenshot-kde.jpg
file modified
+0 -0
tools/fedimg_vars_lib.py
file modified
+5 -4
    Merge branch 'master' of pagure.io:fedora-websites
    
        
file modified
+2 -1
file modified
+5 -4