Merge branch 'develop' into spike/JAL-4386_develop_trial_merge
authorJim Procter <jprocter@dundee.ac.uk>
Thu, 4 Jul 2024 16:40:00 +0000 (17:40 +0100)
committerJim Procter <jprocter@dundee.ac.uk>
Thu, 4 Jul 2024 16:40:00 +0000 (17:40 +0100)
commit7e61eb8556cc0074d8ae65633db74d60d715b6d3
treeb02e0bc4a0595069725c585905a650352fa3a063
parent6d4a9ad85f539652408a58ee43f86ce99f0112bd
parentc99eae6fd25077f99ab20316f69fc9cb8d8189b7
Merge branch 'develop' into spike/JAL-4386_develop_trial_merge

 Conflicts:
src/jalview/gui/AlignFrame.java
src/jalview/gui/CalculationChooser.java
resources/lang/Messages.properties
src/jalview/gui/AlignFrame.java
src/jalview/gui/CalculationChooser.java
src/jalview/gui/PCAPanel.java
src/jalview/project/Jalview2XML.java
src/jalview/viewmodel/AlignmentViewport.java