Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
authorBen Soares <bsoares@dundee.ac.uk>
Tue, 18 Jun 2019 09:52:27 +0000 (10:52 +0100)
committerBen Soares <bsoares@dundee.ac.uk>
Tue, 18 Jun 2019 09:52:27 +0000 (10:52 +0100)
1  2 
build.gradle
gradle.properties

diff --cc build.gradle
Simple merge
Simple merge