From: Jim Procter <jprocter@issues.jalview.org>
Date: Thu, 20 Jun 2019 15:11:07 +0000 (+0100)
Subject: Merge branch 'develop' into bug/JAL-2934proportionalScrolling
X-Git-Tag: Release_2_11_4_0~57^2~1^2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=c561fedabd582a8ac2ca1fae6522dae595610ab2;p=jalview.git

Merge branch 'develop' into bug/JAL-2934proportionalScrolling
---

c561fedabd582a8ac2ca1fae6522dae595610ab2