Merge remote branch 'remotes/deployment/master' into live

[selectricity] / public / stylesheets / front.css

diff --git a/public/stylesheets/front.css b/public/stylesheets/front.css
index 8805abedfe3cfcfefc4cf7af9214ee7c202f8e57..4c973b125a097ee5cf45a4fafb867cf5fcf3d853 100644 (file)
--- a/public/stylesheets/front.css
+++ b/public/stylesheets/front.css
@@ -127,7 +127,6 @@ h3 {
 
 #control-room-content {
        height: 428px;
-       overflow:auto;
 }
 
 #quickvotes {