Merge branch 'develop' into features/JAL-3010ontologyFeatureSettings
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 24 May 2019 14:29:31 +0000 (15:29 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 24 May 2019 14:29:31 +0000 (15:29 +0100)
1  2 
resources/lang/Messages.properties
resources/lang/Messages_es.properties
src/jalview/bin/Jalview.java
src/jalview/gui/AlignFrame.java
src/jalview/gui/FeatureSettings.java
src/jalview/gui/FeatureTypeSettings.java

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge