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)
Conflicts:
src/jalview/jbgui/GStructureViewer.java

1  2 
src/jalview/gui/StructureViewerBase.java
src/jalview/jbgui/GStructureViewer.java