Merge branch 'develop' into Jalview-JS/develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 29 Mar 2019 11:15:31 +0000 (11:15 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 29 Mar 2019 11:15:31 +0000 (11:15 +0000)
commit136df5f299843e2b21dcc3d37a1d7523a322e0e0
tree7176537b4c5441ea095a9dfe692a9f4784b63029
parentb8196b19d8f419759df704d0f016de59b0c6ead0
parent48608cc9210c919f07ffbd25567051384b7903be
Merge branch 'develop' into Jalview-JS/develop

Conflicts:
.classpath
.classpath
.classpath.js
build.xml