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/js/player.js | |
| 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/js/player.js')
| -rw-r--r-- | apps/media/js/player.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/apps/media/js/player.js b/apps/media/js/player.js index f638b86e192..f76628110a8 100644 --- a/apps/media/js/player.js +++ b/apps/media/js/player.js @@ -62,6 +62,7 @@ var PlayList={ } }, cssSelectorAncestor:'#jp-interface', + swfPath:OC.linkTo('media','js'), }); }, add:function(song){ |