Merge branch 'release/1.20.0' into develop
6dc8af01d145
Actions

Authored by David Walend <david_walend@hms.harvard.edu> on Nov 4 2015, 16:01.

Description

Merge branch 'release/1.20.0' into develop

Committed

David Walend <david_walend@hms.harvard.edu>

Nov 4 2015, 16:01

Pushed

mickmis

Mar 14 2017, 15:12

Parents

Branches

Unknown

Tags

Unknown

David Walend <david_walend@hms.harvard.edu> committed R2664:6dc8af01d145: Merge branch 'release/1.20.0' into develop (authored by David Walend <david_walend@hms.harvard.edu>).Nov 4 2015, 16:01

	Commit			Author	Details	Committed
	f7ff6f205264			Ben Carmen	Fix for SHRINE-1227	Nov 3 2015
	c96bcfb440da			Ben Carmen	Code cleanup.	Nov 3 2015

				Path
	M			apps/dashboard-app/src/main/js/src/app/dashboard/apps/happy/happy.js
	M			apps/steward-app/src/main/js/src/app/dashboard/topics/topic-table/topic-detail/role2-description.tpl.html
	M			apps/steward-app/src/main/js/src/app/dashboard/topics/topic-table/topic-detail/role2-edit.tpl.html