Merge branch 'devel' into cc-1960-internationalize-airtime
Conflicts: airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js
This commit is contained in:
commit
10b6dd202e
24 changed files with 370 additions and 393 deletions
|
@ -655,6 +655,7 @@ var AIRTIME = (function(AIRTIME){
|
|||
$pl.find('.success').show();
|
||||
}
|
||||
disableLoadingIcon();
|
||||
setTimeout(removeSuccessMsg, 5000);
|
||||
});
|
||||
})
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue