Scott Comer ca27a6ab97 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop ... Conflicts: db/manifest		2014-05-08 19:47:17 -05:00
..
application_helper_spec.rb	merging jam-web into web	2013-09-15 18:04:37 +00:00
music_session_helper_spec.rb	* all tests pass; but need to now rename music session tables to match class names...	2014-05-06 16:17:26 -05:00
recording_helper_spec.rb	Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop	2014-05-08 19:47:17 -05:00