Merge branch 'develop' into feature/JAL-3390hideUnmappedStructure
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 29 Jun 2020 10:06:39 +0000 (11:06 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 29 Jun 2020 10:06:39 +0000 (11:06 +0100)
commit0dedd282914b05258e76292aaba17045f40e446f
tree3e871fbe3f9a442bb843853d14aea15044655682
parentad94fe2f24935ae35a6531d52b706cea889196d2
parentc9de7d22f36c8866959c8c3ddbad72c2fa841f32
Merge branch 'develop' into feature/JAL-3390hideUnmappedStructure

Conflicts:
src/jalview/jbgui/GStructureViewer.java
src/jalview/gui/StructureViewerBase.java
src/jalview/jbgui/GStructureViewer.java