Seth Call d83a632d0b Conflicts: ... db/manifest web/app/assets/javascripts/jam_rest.js		2014-12-18 15:13:55 -06:00
..
assets/images	* VRFS-783 - the filepicker service behaves different; workaround added. test attempted, but does not work because phantomjs crashes	2013-10-22 14:27:20 -05:00
controllers	Conflicts:	2014-12-18 15:13:55 -06:00
features	VRFS-2529 fixed broken test	2014-12-09 02:57:15 +00:00
files	Merge feature/video_mvp to develop and resolve conflicts.	2014-11-03 18:28:28 -06:00
fixtures/files	merging jam-web into web	2013-09-15 18:04:37 +00:00
helpers	* fix issues with music session 'other count' and tests	2014-11-09 10:59:31 -06:00
javascripts	Conflicts:	2014-12-18 15:13:55 -06:00
managers	* VRFS-1403 - maxmind single step import done	2014-07-19 21:11:16 -05:00
requests	* merge in faster score searches (VRFS-2202)	2014-09-30 10:51:23 -05:00
support	VRFS-2352 : JamTracks - merge from feature/jam_tracks_merge.	2014-11-16 16:23:31 -06:00
factories.rb	Conflicts:	2014-12-18 15:13:55 -06:00
spec_db.rb	wip	2014-05-29 14:34:18 -05:00
spec_helper.rb	Conflicts:	2014-12-18 15:13:55 -06:00
teaspoon_env.rb	* merged	2014-09-22 14:20:58 -05:00
testing_oauth.txt	Merge feature/video_mvp to develop and resolve conflicts.	2014-11-03 18:28:28 -06:00