projects / ympd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d314ac0 68429e3)
Merge branch 'master' of github.com:notandy/ympd
authorAndrew Karpow <andy@ndyk.de>
Mon, 22 Jan 2018 04:02:09 +0000 (05:02 +0100)
committerAndrew Karpow <andy@ndyk.de>
Mon, 22 Jan 2018 04:02:09 +0000 (05:02 +0100)
1  2 
README.md patch | diff1 | diff2 | blob | history

diff --cc README.md
Simple merge
MPD Web GUI - written in C, utilizing Websockets and Bootstrap/JS