From: James Procter Date: Thu, 2 Nov 2023 18:49:04 +0000 (+0000) Subject: Merge branch 'develop' into patch/JAL-3088_finalbracenotinrightplace X-Git-Tag: Release_2_11_4_0~106^2 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=cd669a0e8c7b91b379bca8fe6e702cf0fcbd1ce0;p=jalview.git Merge branch 'develop' into patch/JAL-3088_finalbracenotinrightplace Conflicts: - JAL-4250 src/jalview/renderer/AnnotationRenderer.java --- cd669a0e8c7b91b379bca8fe6e702cf0fcbd1ce0