Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 12 Sep 2018 11:27:21 +0000 (12:27 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 12 Sep 2018 11:27:21 +0000 (12:27 +0100)
commit5b9fcd4e9349485a0be84260b3199c746adfbe92
treee12763cbab67bb394b005cb848fa157f55888e5a
parent78b6e2a08c7780e7d99bd9a1f6e157edd0ddf5d9
parentb39ce946e3f05bcf923abc266df2ef33be95a672
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop