Steven Miers ef949590fe Remove stray log.		2015-07-15 17:07:24 -05:00
..
assets	Remove stray log.	2015-07-15 17:07:24 -05:00
controllers	merge conflict from feature/new_session (VRFS-3283)	2015-07-15 10:04:45 -05:00
helpers	merge conflict from feature/new_session (VRFS-3283)	2015-07-15 10:04:45 -05: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
uploaders	VRFS-1193 fixed landing page promo buzz image display	2014-02-20 09:07:59 -06:00
views	merge conflict from feature/new_session (VRFS-3283)	2015-07-15 10:04:45 -05:00