Steven Miers dffdb78f71 Merge develop into this branch.		2014-10-06 16:17:36 -05:00
..
assets	Merge develop into this branch.	2014-10-06 16:17:36 -05:00
controllers	* VRFS-2298 - tack on JamKazam Staff to username in vanilla forums if admin	2014-10-02 14:04:36 -05:00
helpers	VRFS-2066 fix tests	2014-09-14 21:54:12 -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 develop into this branch.	2014-10-06 16:17:36 -05:00