Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 12 Sep 2018 15:30:52 +0000 (16:30 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 12 Sep 2018 15:30:52 +0000 (16:30 +0100)
commit28c232b27469433dd85d3a09ecf8b6e2ff09eead
tree0c3cc08917e228de6ca3a75a88035a1b3b4a620f
parent5b9fcd4e9349485a0be84260b3199c746adfbe92
parent090ec0d24fd62081f1a4d84c99459655801d39f2
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop