Merge branch 'feature/i2b2-merge-to-develop' into develop
fe153e4b7bbf
Actions

Authored by ben-carmen <benjamin_carmen@hms.harvard.edu> on Oct 18 2016, 16:53.

Description

Merge branch 'feature/i2b2-merge-to-develop' into develop

Committed

ben-carmen <benjamin_carmen@hms.harvard.edu>

Oct 18 2016, 16:53

Pushed

mickmis

Mar 14 2017, 15:12

Parents

Branches

Unknown

Tags

Unknown

ben-carmen <benjamin_carmen@hms.harvard.edu> committed R2664:fe153e4b7bbf: Merge branch 'feature/i2b2-merge-to-develop' into develop (authored by ben-carmen <benjamin_carmen@hms.harvard.edu>).Oct 18 2016, 16:53

	Commit			Author	Details	Committed
	f571d119036d			Ben Carmen	Merge pull request #4 in SHRINE/shrine from ~NWATTANASIN/shrine:feature/i2b2…	Oct 3 2016
	5a20337973ec			Nich	Graph improvements	Sep 26 2016

				Path
	M			shrine-webclient/src/main/html/index.html
	M			shrine-webclient/src/main/html/js-i2b2/cells/CRC/CRC_ctrlr_QryTool.js
	M			shrine-webclient/src/main/html/js-i2b2/cells/CRC/CRC_view_Graphs.js
	M			shrine-webclient/src/main/html/js-i2b2/cells/CRC/assets/query_report.css