Merge branch 'JalviewIntegration' of file:////Users/kjvanderheide/Documents/Archae...
authorkjvdheide <kjvanderheide@dundee.ac.uk>
Fri, 27 Oct 2017 15:43:24 +0000 (16:43 +0100)
committerkjvdheide <kjvanderheide@dundee.ac.uk>
Fri, 27 Oct 2017 15:43:24 +0000 (16:43 +0100)
commitd62c120f4c6fb10f20abaa929514d980fcea9671
tree3ce619a78ab89a0dc6ed85a6bdb2e9d2ec9e285e
parent26d8d47ed32a0eb9bd43c409d0e26ff13570b246
parent60ff1de7026c288116202162d99b77ad7a6ba4ba
Merge branch 'JalviewIntegration' of file:////Users/kjvanderheide/Documents/Archae/forester into JalviewIntegration