Merge branch 'master' of dev.sourcefabric.org:airtime

This commit is contained in:
martin 2011-04-15 12:32:43 -04:00
commit be26c9a9ba
3 changed files with 22 additions and 12 deletions

View file

@ -28,7 +28,7 @@
<div id="show_progressbar"></div>
<span id="show_length" class="time"><?php echo $this->showLength; ?></span>
</div>
<div id="show_time_warning"></div>
<div id="show_time_warning" style="display:none"></div>
</div>
</div>
</div>