Steven Miers 77a3ea7e6b Merge branch 'develop' into feature/jam_track_ui_2		2015-03-26 11:58:47 -05:00
..
assets	VRFS-2830 : Merge / manual fix	2015-03-25 10:56:24 -05:00
controllers	VRFS-2830 : Merge / manual fix	2015-03-25 10:56:24 -05:00
helpers	* VRFS-2917 - shopping cart can be anonymous	2015-03-11 20:55:11 -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 branch 'develop' into feature/jam_track_ui_2	2015-03-26 11:58:47 -05:00