From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Mon, 6 Apr 2020 13:17:24 +0000 (+0100)
Subject: Merge branch 'develop' into Jalview-JS/develop
X-Git-Tag: Release_2_11_4_0~45^2~18^2~18
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=1f54b227847c46fefbe0bfbe923c08fb22bab52d;p=jalview.git

Merge branch 'develop' into Jalview-JS/develop

Conflicts:
	build.gradle
	src/jalview/gui/SeqPanel.java
build.gradle and gradle.properties changes in develop ignored
---

1f54b227847c46fefbe0bfbe923c08fb22bab52d