Jonathan Kolyer c22331c010 conflict merge		2014-01-29 23:05:09 -06:00
..
assets	conflict merge	2014-01-29 23:05:09 -06:00
controllers	conflict merge	2014-01-29 23:05:09 -06: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	conflict merge	2014-01-29 23:05:09 -06:00