From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Tue, 31 Mar 2020 13:42:09 +0000 (+0100)
Subject: Merge branch 'develop' into Jalview-JS/develop
X-Git-Tag: Release_2_11_4_0~45^2~18^2~21^2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=8e75819afe8c00b2046fff54c2ff21175ec7d7a1;p=jalview.git

Merge branch 'develop' into Jalview-JS/develop
---

8e75819afe8c00b2046fff54c2ff21175ec7d7a1