Merge branch 'JAL-3878_ws-overhaul-3' into with_ws_overhaul-3
authorJim Procter <j.procter@dundee.ac.uk>
Mon, 30 Jan 2023 12:23:53 +0000 (12:23 +0000)
committerJim Procter <j.procter@dundee.ac.uk>
Mon, 30 Jan 2023 12:23:53 +0000 (12:23 +0000)
commitbea1d9b563d2fea018de3dbde9112dd59149126e
treefc672491f2bf740ae9c9cddb6e24411388930317
parent49ab19e8189569edf0bc1f4ba8dac14e67f4ca36
parent52eaee0814ad21a395b6e76bfb05511b4fc766ae
Merge branch 'JAL-3878_ws-overhaul-3' into with_ws_overhaul-3

 Conflicts:
src/jalview/gui/AlignFrame.java
src/jalview/gui/SlivkaPreferences.java
src/jalview/workers/AlignCalcManager2.java
src/jalview/datamodel/Sequence.java
src/jalview/gui/AlignFrame.java
src/jalview/gui/Desktop.java
src/jalview/gui/PCAPanel.java
src/jalview/gui/SlivkaPreferences.java
src/jalview/gui/StructureChooser.java
src/jalview/gui/WebserviceInfo.java
src/jalview/gui/WsJobParameters.java
src/jalview/viewmodel/AlignmentViewport.java
src/jalview/workers/AlignCalcManager2.java