Merge branch 'features/r2_11_2_alphafold/JAL-629' into features/JAL-3858_PAEsInProjects
authorJames Procter <j.procter@dundee.ac.uk>
Thu, 16 Feb 2023 13:14:11 +0000 (13:14 +0000)
committerJames Procter <j.procter@dundee.ac.uk>
Thu, 16 Feb 2023 13:14:11 +0000 (13:14 +0000)
commit0de37d1a047209510bab82225109ae2a47931f79
treef388ed18381d5e194c6d0b8214ed2dc71f53495a
parentd6eab72955158d1e070b45dfd93e55c64a47ff86
parent01f8ff469a507604ed961418f7c80f9b245e60ca
Merge branch 'features/r2_11_2_alphafold/JAL-629' into features/JAL-3858_PAEsInProjects

 Conflicts:
src/jalview/bin/Jalview.java
resources/lang/Messages.properties
resources/lang/Messages_es.properties
src/jalview/bin/Cache.java
src/jalview/bin/Jalview.java
src/jalview/gui/AlignFrame.java
src/jalview/gui/AlignViewport.java
src/jalview/gui/StructureChooser.java
src/jalview/io/FileLoader.java