Commit Graph

2 Commits

Author SHA1 Message Date
James 128a497059 CC-3224: "On-the-fly" stream rebroadcasting
- frond-end implementation for master dj and live dj
- db implementation
- liquidsoap is broken on this commit
2012-03-14 14:41:00 -04:00
James a253635f7e CC-3346: Recorder: Merge recorder with pypo
- Upgrade for 2.0.2

Conflicts:

	VERSION
	install_minimal/include/airtime-constants.php
	python_apps/api_clients/api_client.py
2012-02-24 16:30:12 -05:00