Seth Call 3b71931e73 merge conflict from feature/new_session (VRFS-3283)		2015-07-15 10:04:45 -05:00
..
avatars	merging jam-web into web	2013-09-15 18:04:37 +00:00
content	merge conflict from feature/new_session (VRFS-3283)	2015-07-15 10:04:45 -05:00
corp	merging jam-web into web	2013-09-15 18:04:37 +00:00
email	merging jam-web into web	2013-09-15 18:04:37 +00:00
event	* merging manifest	2014-03-10 07:13:01 +00:00
header	merging jam-web into web	2013-09-15 18:04:37 +00:00
isps	* adding in updated jnlp files	2013-12-17 23:55:10 +00:00
shared	VRFS-1481 display 256x256 instrument icons on musician profile page	2014-03-17 18:55:11 -04:00
sidebar	merging jam-web into web	2013-09-15 18:04:37 +00:00
web	merge conflict from feature/new_session (VRFS-3283)	2015-07-15 10:04:45 -05:00
down_arrow.png	merging jam-web into web	2013-09-15 18:04:37 +00:00
google_signin.png	VRFS-1849 : Show google login link beside the "Upload to Youtube" link.	2014-11-04 12:31:38 -06:00
logo.png	merging jam-web into web	2013-09-15 18:04:37 +00:00
logo_corporate.png	merging jam-web into web	2013-09-15 18:04:37 +00:00
rails.png	merging jam-web into web	2013-09-15 18:04:37 +00:00
up_arrow.png	Merge and fix	2015-04-16 12:16:09 -05:00