Merge branch 'release/1.21.0' into develop
a7c81c84039a
Actions

Authored by David Walend <david_walend@hms.harvard.edu> on Mar 24 2016, 14:40.

Description

Merge branch 'release/1.21.0' into develop

Committed

David Walend <david_walend@hms.harvard.edu>

Mar 24 2016, 14:40

Pushed

mickmis

Mar 14 2017, 15:12

Parents

Branches

Unknown

Tags

Unknown

David Walend <david_walend@hms.harvard.edu> committed R2664:a7c81c84039a: Merge branch 'release/1.21.0' into develop (authored by David Walend <david_walend@hms.harvard.edu>).Mar 24 2016, 14:40

Commit	Author	Details	Committed
d0fe8abcc120	David Walend	Possible fix for SHRINE-1374 - happy's xml should come back with an empty…	Mar 23 2016
3b88331b487c	David Walend	Logging to figure out SHRINE-1374	Mar 23 2016
495e4ea71f9b	David Walend	Possible fix for SHRINE-1325 - URL value for the network hub box in the QEP…	Mar 23 2016

				Path
	M			apps/dashboard-app/src/main/js/src/app/diagnostic/diagnostic.model.js
	M			apps/dashboard-app/src/main/js/src/app/diagnostic/views/qep.controller.js
	M			apps/dashboard-app/src/main/scala/net/shrine/dashboard/DashboardService.scala