From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Thu, 19 Dec 2019 15:59:33 +0000 (+0000)
Subject: Merge branch 'Jalview-JS/develop' of https://source.jalview.org/git/jalview.git into... 
X-Git-Tag: Release_2_11_4_0~45^2~18^2~42
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=ed71244bc1c77e2168a8eb64a3ef8100cb56e2c1;p=jalview.git

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

ed71244bc1c77e2168a8eb64a3ef8100cb56e2c1