merge from develop: the rest of the changes
authorsoares <bsoares@dundee.ac.uk>
Tue, 7 Apr 2020 19:14:19 +0000 (20:14 +0100)
committersoares <bsoares@dundee.ac.uk>
Tue, 7 Apr 2020 19:14:19 +0000 (20:14 +0100)
commit51a30148a9c20b816fc6d4a4e2bd75748c8664cc
tree5054eb71952b7c3f48f74d37d00ce46f705c2150
parentce3d27d8c625c0f8a1a0d766fbf7941d92d88c94
merge from develop: the rest of the changes
build.gradle
gradle.properties