Jonathan Kolyer 832e716e8b Merge branch 'feature/musician_profile_enhancements' into feature/musician_search2		2015-06-28 19:52:45 +00:00
..
flash	* VRFS-1083 user_authorizations require user now; found some bugs	2014-02-07 17:18:57 +00:00
fonts	Merge with develop.	2015-06-03 14:22:21 -05:00
images	Merge with develop.	2015-06-03 14:22:21 -05:00
javascripts	Merge branch 'feature/musician_profile_enhancements' into feature/musician_search2	2015-06-28 19:52:45 +00:00
stylesheets	Merge branch 'feature/musician_profile_enhancements' into feature/musician_search2	2015-06-28 19:52:45 +00:00