Merge branch 'develop' into features/JAL-3010ontologyFeatureSettings features/JAL-3010ontologyFeatureSettings
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 12 Jul 2019 13:38:34 +0000 (14:38 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 12 Jul 2019 13:38:34 +0000 (14:38 +0100)
commit6a05eb3f55d97e685f0c723822384633d5636778
tree586187be0cd3ee94a153bb2d26b085e91d9719ca
parentd113749a183a3ea8f3f7e22c725511f59f1d833f
parentfa2429b3c8cd5eb56c4a56572af6e9c4adc916c9
Merge branch 'develop' into features/JAL-3010ontologyFeatureSettings

Conflicts:
test/jalview/gui/AlignFrameTest.java
resources/lang/Messages.properties
resources/lang/Messages_es.properties
src/jalview/gui/AlignFrame.java
src/jalview/gui/CrossRefAction.java
src/jalview/io/gff/SequenceOntologyLite.java
test/jalview/gui/AlignFrameTest.java