Merge branch 'saas-dev' into saas-stream-settings

Conflicts:
	airtime_mvc/application/models/Preference.php
This commit is contained in:
Duncan Sommerville 2015-07-10 10:29:38 -04:00
commit 37ed35f5b2
16 changed files with 94 additions and 17 deletions

View file

@ -47,6 +47,11 @@ select {
border:1px solid #9d9d9d;
}
/* Fix for Firefox */
fieldset {
clear: both;
}
.logo {
background: transparent url(images/airtime_logo.png) no-repeat 0 0;
height: 35px;