5 Commits

Author	SHA1	Message	Date
Seth Call	d83a632d0b	Conflicts: ... db/manifest web/app/assets/javascripts/jam_rest.js	2014-12-18 15:13:55 -06:00
Seth Call	f3d39a351d	* wip	2014-05-06 08:34:38 -05:00
Seth Call	e57946afd2	* fixing tests, and adding a bunch more jam-admin page work for managing icecast, as well as the beginnings of the REST API for icecast (VRFS-1002 and VRFS-1006)	2014-01-19 02:20:44 +00:00
Seth Call	8e8e699788	* fixing nil.publish test in mq_router.spec	2014-01-07 16:01:36 +00:00
Seth Call	6ea4bae05c	merging jam-ruby into ruby	2013-09-15 18:04:03 +00:00