Merge branch 'develop' into Jalview-JS/develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 6 Apr 2020 13:17:24 +0000 (14:17 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 6 Apr 2020 13:17:24 +0000 (14:17 +0100)
commit1f54b227847c46fefbe0bfbe923c08fb22bab52d
treeb1142fad121c8e4e1ac7425c36a7ebbbaeb1648c
parentb61fb78d8ba7c310a2493a4d4dd75a8aaa777204
parentc53cc5969e41f96099d2a81400353c3b39f164b7
Merge branch 'develop' into Jalview-JS/develop

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