2c87fb1
merge conflicting commits and we are ready to go - thx ryanlerch
Merged and Committed by 
robyduck
4 years ago
fedoraproject.org/data/content/join-fedora.html
file modified
+7
-14
flocktofedora.org/data/content/index.html
file modified
+20
-6
flocktofedora.org/data/content/sponsorship/index.html
file modified
+9
-3
flocktofedora.org/data/templates/head.html
file modified
+1
-1
flocktofedora.org/static/css/flock.css
file modified
+16
-3