diff options
| author | Jakob Sack <kde@jakobsack.de> | 2011-07-29 20:42:24 +0200 |
|---|---|---|
| committer | Jakob Sack <kde@jakobsack.de> | 2011-07-29 20:42:24 +0200 |
| commit | 2bfad189e7e9c8ea78e4b5f78c9e779074dd991c (patch) | |
| tree | 697204517c95647e382a4723545ade3950420913 /apps/media/templates/player.php | |
| parent | e69079f9354464d21f31ae8b6d9e47988ba22fb4 (diff) | |
| parent | d12d08e2f3553b06df6371535f971c9f193bd388 (diff) | |
| download | nextcloud-server-2bfad189e7e9c8ea78e4b5f78c9e779074dd991c.tar.gz nextcloud-server-2bfad189e7e9c8ea78e4b5f78c9e779074dd991c.zip | |
Merge branch 'master' of git://anongit.kde.org/owncloud into autoload
Conflicts:
lib/base.php
lib/filestorage.php
Diffstat (limited to 'apps/media/templates/player.php')
| -rw-r--r-- | apps/media/templates/player.php | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/apps/media/templates/player.php b/apps/media/templates/player.php index abba806510e..b307f984734 100644 --- a/apps/media/templates/player.php +++ b/apps/media/templates/player.php @@ -17,7 +17,6 @@ <div class="jp-volume-bar-value"></div> </div> <div class="jp-current-time"></div> - <div class="jp-current-time"></div> <div class="jp-duration"></div> - <div class='player'></div> + <div class='player' id='jp-player'></div> </div>
\ No newline at end of file |