Merge branch 'develop' into patch/JAL-3088_finalbracenotinrightplace
authorJames Procter <j.procter@dundee.ac.uk>
Thu, 2 Nov 2023 18:49:04 +0000 (18:49 +0000)
committerJames Procter <j.procter@dundee.ac.uk>
Thu, 2 Nov 2023 18:49:04 +0000 (18:49 +0000)
commitcd669a0e8c7b91b379bca8fe6e702cf0fcbd1ce0
tree39900e071f026b642ca29a31bced7bcee2b0111a
parentc956ba7ae40dd7f269aa372044ed4ed5f28fb042
parentbc7ebbb58133e64e7a77cb83eef8e2df75faec03
Merge branch 'develop' into patch/JAL-3088_finalbracenotinrightplace

 Conflicts: - JAL-4250
src/jalview/renderer/AnnotationRenderer.java
src/jalview/renderer/AnnotationRenderer.java