Merge branch 'develop' into features/JAL-518_justify_seqs_in_region
authorJim Procter <jprocter@dundee.ac.uk>
Mon, 13 May 2024 12:44:27 +0000 (13:44 +0100)
committerJim Procter <jprocter@dundee.ac.uk>
Mon, 13 May 2024 12:44:27 +0000 (13:44 +0100)
commitc8d80485038ab96fb06bd0885c323803646d8e57
tree1112651b36b9199c1abe3eec279f305de6f1e15c
parent1b1f995b3eb83dc3496510bfc2278f1f72fcfd8a
parentc4d23061be96300cc0af4c25d8628665a9c2a155
Merge branch 'develop' into features/JAL-518_justify_seqs_in_region

 Conflicts:
src/jalview/api/AlignViewControllerI.java
src/jalview/api/AlignViewportI.java
src/jalview/controller/AlignViewController.java
help/help/html/menus/alwedit.html
resources/lang/Messages.properties
src/jalview/api/AlignViewControllerI.java
src/jalview/api/AlignViewportI.java
src/jalview/controller/AlignViewController.java
src/jalview/gui/AlignFrame.java
src/jalview/gui/PopupMenu.java
src/jalview/jbgui/GAlignFrame.java
src/jalview/viewmodel/AlignmentViewport.java