Merge branch '2.5.x' into saas

Conflicts: CREDITS
2015-01-20 11:44:53 -05:00 · 2015-01-20 11:44:53 -05:00 · 2fadc8f8f1
commit 2fadc8f8f1
parent 609a46dfa3 6ac5a2950f
19 changed files with 130 additions and 39 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 {