Brian Smith 9e72e6510a merge develop		2014-02-04 20:21:24 -05:00
..
assets	merge develop	2014-02-04 20:21:24 -05:00
controllers	* VRFS-1018 - audiomixer ruby runner generates an mp3 with metadata using ffmpeg	2014-02-04 20:28:00 +00:00
helpers	* VRFS-821 many changes for upload apis, mostly	2013-12-17 19:44:21 +00:00
mailers	merging jam-web into web	2013-09-15 18:04:37 +00:00
responders	* the form VRFS-922, VRFS-918 (mix checks user permissions), VRFS-945 (verify download permissions for tracks)	2013-12-30 18:34:15 +00:00
views	merge develop	2014-02-04 20:21:24 -05:00