Merge branch 'develop' into feature/new-crypto
ac4fa7e85ffc
Actions

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

Description

Merge branch 'develop' into feature/new-crypto

Committed

Ty <Ty_Coghlan@hms.harvard.edu>

Oct 13 2016, 19:35

Pushed

mickmis

Mar 14 2017, 15:12

Parents

Branches

Unknown

Tags

Unknown

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

	Commit			Author	Details	Committed
	a687e46c86c2			Ty	fixed scanner test	Oct 13 2016
	3e4e094e8447			Ty	Merge branch 'feature/new-crypto' into develop	Oct 13 2016

				Path
	M			.gitignore
	M			tools/scanner/src/test/scala/net/shrine/utilities/scanner/ScannerTest.scala