Merge branch 'feature/new-crypto' into develop
2faa6aef2615
Actions

Authored by Ty <Ty_Coghlan@hms.harvard.edu> on Oct 13 2016, 22:07.

Description

Merge branch 'feature/new-crypto' into develop

Committed

Ty <Ty_Coghlan@hms.harvard.edu>

Oct 13 2016, 22:07

Pushed

mickmis

Mar 14 2017, 15:12

Parents

Branches

Unknown

Tags

Unknown

Ty <Ty_Coghlan@hms.harvard.edu> committed R2664:2faa6aef2615: Merge branch 'feature/new-crypto' into develop (authored by Ty <Ty_Coghlan@hms.harvard.edu>).Oct 13 2016, 22:07

	Commit			Author	Details	Committed
	9a61fdd8185a			Ty	added modified date to adapter	Oct 13 2016
	728f51ebdf70			Ty	Merge branch 'develop' into feature/new-crypto	Oct 13 2016

				Path
	M			apps/dashboard-app/src/main/js/src/app/diagnostic/views/adapter.controller.js
	M			apps/dashboard-app/src/main/js/src/app/diagnostic/views/adapter.tpl.html
	M			apps/dashboard-app/src/main/js/src/app/diagnostic/views/summary.tpl.html
	M			apps/dashboard-app/src/main/js/test/admin/status/summary.json
	M			apps/dashboard-app/src/test/resources/teststatus/summary
	M			apps/shrine-app/src/main/scala/net/shrine/status/StatusJaxrs.scala
	M			apps/shrine-app/src/test/scala/net/shrine/status/StatusJaxrsTest.scala