Seth Call c92bc8fdc1 Merge branch 'feature/social_buttons' into develop		2014-08-19 12:32:32 -05:00
..
assets	Merge branch 'feature/social_buttons' into develop	2014-08-19 12:32:32 -05:00
controllers	* VRFS-2064 - stop cycle in network test; VRFS-2062 - don't store HTML in user-inputs	2014-08-18 20:41:44 -05:00
helpers	VRFS-1891 VRFS-2022 bug fixes / test additions	2014-08-15 00:32:45 -04: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 'feature/social_buttons' into develop	2014-08-19 12:32:32 -05:00