Scott Comer 94421c03c0 merge conflict with db/manifest resolved		2014-05-21 21:33:38 -05:00
..
assets	* brought back two pending test	2014-05-19 18:49:02 -05:00
controllers	merge conflict with db/manifest resolved	2014-05-21 21:33:38 -05:00
helpers	* VRFS-1730 - websocket on web layout	2014-05-19 16:57:08 -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	* VRFS-1730 - websocket on web layout	2014-05-19 16:57:08 -05:00