Merge branch '2.5.x' into 2.5.x-albertenhancements

2015-02-24 10:45:52 -05:00 · 2015-02-24 10:45:52 -05:00 · 69d588d2f6
commit 69d588d2f6
parent f9bf71a349 19851efbe5
53 changed files with 393 additions and 127 deletions
--- a/airtime_mvc/public/css/styles.css
+++ b/airtime_mvc/public/css/styles.css
@ -10,6 +10,7 @@ body {
 }
 html, body {
    height: 100%;
+    background: #7f7f7f;
 }

 #login-page {