Steven Miers a9ab5bb730 Merge video_ui branch into develop.		2015-04-21 13:47:00 -05:00
..
assets	Merge video_ui branch into develop.	2015-04-21 13:47:00 -05:00
controllers	* fix jamtrack landing page formatting VRFS-3056	2015-04-20 22:13:30 -05:00
helpers	* VRFS-3061 - deal with shopping cart porting over correctly when user logs in during shopping	2015-04-19 16:40:35 -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 video_ui branch into develop.	2015-04-21 13:47:00 -05:00