Merge branch 'develop' into task/JAL-3337_gradle_tasks_sourceDist_and_help2Website
authorBen Soares <bsoares@dundee.ac.uk>
Tue, 2 Jul 2019 12:34:30 +0000 (13:34 +0100)
committerBen Soares <bsoares@dundee.ac.uk>
Tue, 2 Jul 2019 12:34:30 +0000 (13:34 +0100)
Merging in develop

1  2 
gradle.properties

Simple merge