3 Commits

Author	SHA1	Message	Date
Jonathan Kolyer	e8fd6360aa	VRFS-2552 removed config.json_engine due to this error: undefined method key? JSON::Ext::Generator::State	2015-01-01 18:00:43 +00:00
Seth Call	d83a632d0b	Conflicts: ... db/manifest web/app/assets/javascripts/jam_rest.js	2014-12-18 15:13:55 -06:00
Seth Call	2f41675471	merging jam-web into web	2013-09-15 18:04:37 +00:00