Merge branch 'saas-dev' into soundcloud

Conflicts:
	airtime_mvc/application/configs/constants.php
This commit is contained in:
Duncan Sommerville 2015-06-29 10:02:58 -04:00
commit 5cc8774e56
30 changed files with 194 additions and 182 deletions

View file

@ -148,7 +148,7 @@ var AIRTIME = (function(AIRTIME) {
mod.checkDeleteButton = function() {
var selected = mod.getChosenItemsLength(),
check = false;
if (selected !== 0) {
check = true;
}