Merge branch 'develop' into feature/JAL-4159_pasimap_JAL-4423_alt_msa_source
authorJim Procter <jprocter@dundee.ac.uk>
Mon, 19 Aug 2024 16:39:09 +0000 (17:39 +0100)
committerJim Procter <jprocter@dundee.ac.uk>
Mon, 19 Aug 2024 16:39:09 +0000 (17:39 +0100)
commitadfc6a43209b833b6c4fa7c68fbebbf6d0ba0834
treea08db9a418081d482ef5381f761da69208d47cef
parente9c1d324e97ab565c847f8070176c11dd9b6e7bf
parentbe110b0de54d8e840c1468fa06441d42a44edd87
Merge branch 'develop' into feature/JAL-4159_pasimap_JAL-4423_alt_msa_source

 Conflicts:
src/jalview/analysis/AlignSeq.java
src/jalview/analysis/PaSiMap.java
src/jalview/gui/CalculationChooser.java
src/jalview/gui/PaSiMapPanel.java
src/jalview/viewmodel/PaSiMapModel.java
src/jalview/analysis/AlignSeq.java
src/jalview/analysis/PaSiMap.java
src/jalview/gui/CalculationChooser.java
src/jalview/gui/PaSiMapPanel.java
src/jalview/viewmodel/PaSiMapModel.java