From: Jim Procter <jprocter@issues.jalview.org>
Date: Mon, 29 Jun 2020 16:50:24 +0000 (+0100)
Subject: Merge branch 'develop' of http://source.jalview.org/git/jalview into develop
X-Git-Tag: Develop-2_11_2_0-d20201215~24^2~32
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=601e4514d936ac67720ea5678f51a90d39d1355b;hp=601e4514d936ac67720ea5678f51a90d39d1355b;p=jalview.git

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