From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Mon, 29 Jun 2020 10:06:39 +0000 (+0100)
Subject: Merge branch 'develop' into feature/JAL-3390hideUnmappedStructure
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=0dedd282914b05258e76292aaba17045f40e446f;p=jalview.git

Merge branch 'develop' into feature/JAL-3390hideUnmappedStructure

Conflicts:
	src/jalview/jbgui/GStructureViewer.java
---

0dedd282914b05258e76292aaba17045f40e446f