projects / ympd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4295d15 379a5ff)
Merge branch 'expire1' of github.com:parabelboi/ympd into local_play
authorSuperBFG7 <daniel@despite.ch>
Sun, 27 Sep 2015 13:34:58 +0000 (15:34 +0200)
committerSuperBFG7 <daniel@despite.ch>
Sun, 27 Sep 2015 13:34:58 +0000 (15:34 +0200)
1  2 
htdocs/index.html patch | diff1 | diff2 | blob | history
htdocs/js/mpd.js patch | diff1 | diff2 | blob | history

diff --cc htdocs/index.html
Simple merge
diff --cc htdocs/js/mpd.js
Simple merge
MPD Web GUI - written in C, utilizing Websockets and Bootstrap/JS