From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Mon, 29 Jun 2020 10:55:14 +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~36
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=3b2dd110a9283ae50db9302c8cc22ab4aec7a199;hp=3b2dd110a9283ae50db9302c8cc22ab4aec7a199;p=jalview.git

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