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)
commit0b2c69c2818b1ec86c4fe12f7537cda638a8c4f0
tree2c2d1395c0a7b32ceca357b308dbd4b06cafedf5
parent4295d1587446872688fe7fa307e33fbc586bc9bc
parent379a5ffce3e4f58b7ac0087668e4dde14db08cfd
Merge branch 'expire1' of github.com:parabelboi/ympd into local_play
htdocs/index.html
htdocs/js/mpd.js