Merge branch 'release/1.20.0' into develop
5358b449f362
Actions

Authored by David Walend <david_walend@hms.harvard.edu> on Nov 2 2015, 21:57.

Description

Merge branch 'release/1.20.0' into develop

Committed

David Walend <david_walend@hms.harvard.edu>

Nov 2 2015, 21:57

Pushed

mickmis

Mar 14 2017, 15:12

Parents

Branches

Unknown

Tags

Unknown

David Walend <david_walend@hms.harvard.edu> committed R2664:5358b449f362: Merge branch 'release/1.20.0' into develop (authored by David Walend <david_walend@hms.harvard.edu>).Nov 2 2015, 21:57

Commit	Author	Details	Committed
6b7a860e0883	David Walend	Now trapping ClientHandlerException. Fix for SHRINE-1220.	Nov 2 2015
d8f619cc81e1	David Walend	Merge branch 'release/1.20.0' of https://open.med.harvard.	Nov 2 2015
d754dc7dc58c	Ben Carmen	Cleanup of unused styles.	Nov 2 2015

				Path
	M			apps/dashboard-app/src/main/js/src/assets/css/shrine.css
	M			apps/steward-app/src/main/js/src/app/dashboard/history/history.tpl.html
	M			apps/steward-app/src/main/js/src/app/dashboard/statistics/statistics.tpl.html
	M			apps/steward-app/src/main/js/src/app/dashboard/topics/topics.tpl.html
	M			apps/steward-app/src/main/js/src/assets/css/shrine.css
	M			hub/broadcaster-aggregator/src/main/scala/net/shrine/aggregation/BasicAggregator.scala