3 Commits

Author	SHA1	Message	Date
Seth Call	3b71931e73	merge conflict from feature/new_session (VRFS-3283)	2015-07-15 10:04:45 -05:00
Seth Call	1f37b9881f	* parameterizing email configs and trying to speed up build on server	2014-01-14 16:55:34 -06:00
Seth Call	c8150c8aee	merging jam-admin into admin	2013-09-16 03:15:31 +00:00