From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Tue, 26 May 2020 16:27:08 +0000 (+0100)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
X-Git-Tag: Develop-2_11_2_0-d20201215~24^2~59
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=f80d893b05dab20f45ec5598e49cac8818b642cb;hp=-c;p=jalview.git

Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
---

f80d893b05dab20f45ec5598e49cac8818b642cb