Seth Call d83a632d0b Conflicts: ... db/manifest web/app/assets/javascripts/jam_rest.js		2014-12-18 15:13:55 -06:00
..
assets	merging jam-web into web	2013-09-15 18:04:37 +00:00
jam_web	merging jam-web into web	2013-09-15 18:04:37 +00:00
middlewares	* whack the default domain cookie if we see an attempt to invalidate	2014-03-21 16:20:34 +00:00
tasks	Conflicts:	2014-12-18 15:13:55 -06:00
js_connect.rb	* VRFS-1493 - redirect to forums implemented, VRFS-1507 (signin url preserved on postback failure)	2014-03-21 03:23:33 +00:00
max_mind_manager.rb	* VRFS-1403 - maxmind single step import done	2014-07-19 21:11:16 -05:00
music_session_manager.rb	fix more session join/leave bugs	2014-09-14 15:12:25 -04:00
user_manager.rb	* VRFS-1403 - maxmind single step import done	2014-07-19 21:11:16 -05:00
youtube_client.rb	Merge feature/video_mvp to develop and resolve conflicts.	2014-11-03 18:28:28 -06:00