jcass 19363e1476 Merge remote-tracking branch 'upstream/develop' into fix/79_explicit_2 ... Conflicts: README.rst		2016-01-31 06:46:25 +02:00
..
static	Merge remote-tracking branch 'upstream/develop' into fix/79_explicit_2	2016-01-31 06:46:25 +02:00
__init__.py	Make musicbox config setting optional	2015-04-26 00:50:40 +01:00
ext.conf	Optional config settings for websocket host and port	2015-04-26 00:38:43 +01:00
web.py	Use correct websocket protocol when using websocket_host/port settings	2015-08-25 15:54:33 +01:00