Merge remote-tracking branch 'robbt/fix/show_files_meet_criteria' into dev/merge-testing

2018-01-09 21:51:30 +01:00 · 2018-01-09 21:51:30 +01:00 · b7b581e6ec
commit b7b581e6ec
parent a51f33442e c8ba866484
5 changed files with 14 additions and 39 deletions
--- a/airtime_mvc/application/views/scripts/playlist/update.phtml
+++ b/airtime_mvc/application/views/scripts/playlist/update.phtml
@ -123,6 +123,7 @@ if (($i < count($items) -1) && ($items[$i+1]['type'] == 0)) {
            }

            echo $this->partial('playlist/set-fade.phtml', $vars);
+
            ?>
        </div>
        <?php endif; ?>