Merge branch 'develop' into task/JAL-3337_gradle_tasks_sourceDist_and_help2Website
authorBen Soares <bsoares@dundee.ac.uk>
Mon, 1 Jul 2019 09:17:31 +0000 (10:17 +0100)
committerBen Soares <bsoares@dundee.ac.uk>
Mon, 1 Jul 2019 09:17:31 +0000 (10:17 +0100)
commit2bce56ac3057c9028d482419b1506832e9822a71
treeb5f9d6339a570e4a890c54a0555b42aa8b0c43b1
parentb8ec772c96ef1eadb0145b34053d8effb233b1c3
parent0ccb42e83189e8ce1682af2885f5a44be0f260ea
Merge branch 'develop' into task/JAL-3337_gradle_tasks_sourceDist_and_help2Website

update merging develop into this branch