Merge branch 'merge/develop_JAL-3725' into develop
authorJim Procter <j.procter@dundee.ac.uk>
Fri, 28 Jan 2022 17:08:35 +0000 (17:08 +0000)
committerJim Procter <j.procter@dundee.ac.uk>
Fri, 28 Jan 2022 17:08:35 +0000 (17:08 +0000)
commit0aa7f6fab658c9a203b410d4bead72217da5c9a0
tree56c145cb11f0cce68fff25930a1dc5ec622aa01a
parentb26fefd329b60deb2025aa28cdbaae30bfb58382
parent0913cb6ee2033d714c0aa6eb3e152da7485b21a4
Merge branch 'merge/develop_JAL-3725' into develop

 Conflicts:
src/jalview/gui/PopupMenu.java
src/jalview/gui/PopupMenu.java
src/jalview/util/MappingUtils.java
test/jalview/util/MapListTest.java
test/jalview/util/MappingUtilsTest.java