Merge branch 'develop' into features/JAL-4134_use_annotation_row_for_colours_and_groups
authorJames Procter <j.procter@dundee.ac.uk>
Fri, 26 May 2023 11:57:41 +0000 (12:57 +0100)
committerJames Procter <j.procter@dundee.ac.uk>
Fri, 26 May 2023 11:57:41 +0000 (12:57 +0100)
commite67a74ee1dac618d941fce0fc5ef4561f76380b1
tree36d41ef157c5cb03f521457bf59abc9659c827ed
parentd8fcaf315395d614059f4345c20ff2f86a4476f1
parent559683447a76180ede214c9b44f018b5c7539987
Merge branch 'develop' into features/JAL-4134_use_annotation_row_for_colours_and_groups

 Conflicts:
src/jalview/gui/AnnotationLabels.java
resources/lang/Messages.properties
src/jalview/gui/AlignFrame.java
src/jalview/gui/AlignViewport.java
src/jalview/gui/AnnotationLabels.java
src/jalview/gui/StructureChooser.java