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)
commitbc63608f79f00f1150decc0d62a1e1095da45f00
treee59f6764a1ccd722ce08de19845ac5da3e6ea3aa
parent95c1cf642944fc856eee1a076b2a9202f2821f83
parent772a0325f9223183aeb978c81d2d9cdcb12100df
Merge branch 'develop' into task/JAL-3337_gradle_tasks_sourceDist_and_help2Website

Merging in develop
gradle.properties