Merge branch 'master' into riccardo
547a1be03459
Actions

Authored by root <root@icsil1noteb228.epfl.ch> on Jun 29 2018, 14:25.

Description

Merge branch 'master' into riccardo

Committed

root <root@icsil1noteb228.epfl.ch>

Jun 29 2018, 14:25

Pushed

succa

Jun 29 2018, 15:58

Parents

Branches

Unknown

Tags

Unknown

root <root@icsil1noteb228.epfl.ch> committed R4434:547a1be03459: Merge branch 'master' into riccardo (authored by root <root@icsil1noteb228.epfl.ch>).Jun 29 2018, 14:25

	Commit			Author	Details	Committed
	d9d0115136c2			mickmis	update i2b2common-core lib with timeout	Apr 24 2018
	71a0160727ca			mickmis	larger timeout value for medco cell	Apr 24 2018

				Path
	M			etc/spring/medcoapp/medco.properties
	M			lib/i2b2_core_libs/i2b2Common-core.jar