From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Fri, 6 Mar 2020 16:06:20 +0000 (+0000)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
X-Git-Tag: Develop-2_11_2_0-d20201215~79^2~5
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=5442c094270c57798747ee8d974b7ef010f87a82;p=jalview.git

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

5442c094270c57798747ee8d974b7ef010f87a82