Brian Smith a87c08afe3 Merge branch 'develop' into feature/musician_profile_enhancements		2015-04-01 23:09:51 -04:00
..
flash	* VRFS-1083 user_authorizations require user now; found some bugs	2014-02-07 17:18:57 +00:00
fonts/lato	merging jam-web into web	2013-09-15 18:04:37 +00:00
images	merge develop	2015-03-29 10:12:42 -04:00
javascripts	Merge branch 'develop' into feature/musician_profile_enhancements	2015-04-01 23:09:51 -04:00
stylesheets	Merge branch 'develop' into feature/musician_profile_enhancements	2015-04-01 23:09:51 -04:00