Merge branch 'develop' into trialMerge
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 19 Apr 2019 15:04:51 +0000 (16:04 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 19 Apr 2019 15:04:51 +0000 (16:04 +0100)
commita7640c4b1d23de78b3fdd2f758260a4eb7c240e7
tree358623a7564603eb95d31daac8d5f45211f28f53
parent2da139b2af34371c87a4471718a98addeb90a9d0
parent58ecc1bd5b01acd8f8378980f369003da9db2ee9
Merge branch 'develop' into trialMerge

Conflicts:
resources/lang/Messages.properties
resources/lang/Messages_es.properties
src/jalview/gui/FeatureSettings.java
src/jalview/gui/FeatureTypeSettings.java
resources/lang/Messages.properties
resources/lang/Messages_es.properties
src/jalview/bin/Jalview.java
src/jalview/controller/AlignViewController.java
src/jalview/gui/AlignFrame.java
src/jalview/gui/FeatureSettings.java
src/jalview/gui/FeatureTypeSettings.java
src/jalview/gui/SequenceFetcher.java
test/jalview/controller/AlignViewControllerTest.java
test/jalview/gui/AlignFrameTest.java