Merge branch 'release/1.20.0' into develop
daf1b6609d07
Actions

Authored by David Walend <david_walend@hms.harvard.edu> on Nov 3 2015, 23:12.

Description

Merge branch 'release/1.20.0' into develop

Committed

David Walend <david_walend@hms.harvard.edu>

Nov 3 2015, 23:12

Pushed

mickmis

Mar 14 2017, 15:12

Parents

Branches

Unknown

Tags

Unknown

David Walend <david_walend@hms.harvard.edu> committed R2664:daf1b6609d07: Merge branch 'release/1.20.0' into develop (authored by David Walend <david_walend@hms.harvard.edu>).Nov 3 2015, 23:12

Commit	Author	Details	Committed
e869cca2d3ee	Ben Carmen	fix for SHRINE-1216	Nov 3 2015
8862ebe7f498	Ben Carmen	Fix for SHRINE 1225	Nov 3 2015
cccff4b4d1aa	Ben Carmen	Merge remote-tracking branch 'origin/release/1.20.0' into release/1.20.0	Nov 3 2015
37a3e43814dd	Ben Carmen	Fix for SHRINE 1225	Nov 3 2015

				Path
	M			apps/dashboard-app/src/main/js/src/app/dashboard/apps/happy/happy.js
	M			shrine-webclient/src/main/html/js-i2b2/cells/SHRINE/EnhancedError.js