]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorIan <ian@sproink.co.uk>
Mon, 26 May 2014 22:13:28 +0000 (23:13 +0100)
committerIan <ian@sproink.co.uk>
Mon, 26 May 2014 22:13:28 +0000 (23:13 +0100)
1  2 
src/webui/static/app/dvr.js

Simple merge