]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
projects / thirdparty / tvheadend.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9722e42 fbad531)
Merge remote-tracking branch 'origin/pr/338'
authorAdam Sutton <dev@adamsutton.me.uk>
Fri, 7 Mar 2014 20:44:39 +0000 (20:44 +0000)
committerAdam Sutton <dev@adamsutton.me.uk>
Fri, 7 Mar 2014 20:44:39 +0000 (20:44 +0000)
1  2 
src/webui/static/app/chconf.js patch | diff1 | diff2 | blob | history

diff --cc src/webui/static/app/chconf.js
Simple merge
Mirror of https://github.com/tvheadend/tvheadend.git