Jonathan Kolyer 713344a7a7 merge conflict		2014-03-08 20:50:51 +00:00
..
jam_ruby	merge conflict	2014-03-08 20:50:51 +00:00
mailers	vrfs-775: integrating new musician emails	2013-11-26 00:03:42 -06:00
support	* VRFS-1228	2014-02-25 19:22:32 +00:00
factories.rb	merge conflict	2014-03-08 20:50:51 +00:00
spec_db.rb	merging jam-ruby into ruby	2013-09-15 18:04:03 +00:00
spec_helper.rb	update user with connection address on login or reconnect; make the better test data useable; fix up tests for geo stuff	2014-03-02 23:16:48 -06:00
uses_temp_files.rb	merging jam-ruby into ruby	2013-09-15 18:04:03 +00:00