Merge branch 'improvement/JAL-3394_added_categories_to_unix_shell_installer_desktop_f...

author Ben Soares <bsoares@dundee.ac.uk>

Thu, 2 Apr 2020 11:42:30 +0000 (12:42 +0100)

committer Ben Soares <bsoares@dundee.ac.uk>

Thu, 2 Apr 2020 11:42:30 +0000 (12:42 +0100)
author Ben Soares <bsoares@dundee.ac.uk>
Thu, 2 Apr 2020 11:42:30 +0000 (12:42 +0100)
committer Ben Soares <bsoares@dundee.ac.uk>
Thu, 2 Apr 2020 11:42:30 +0000 (12:42 +0100)
diff --cc build.gradle
Simple merge
diff --cc gradle.properties
Simple merge
author	Ben Soares <bsoares@dundee.ac.uk>
	Thu, 2 Apr 2020 11:42:30 +0000 (12:42 +0100)
committer	Ben Soares <bsoares@dundee.ac.uk>
	Thu, 2 Apr 2020 11:42:30 +0000 (12:42 +0100)
		1	2
build.gradle	patch \|	diff1 \|	diff2 \|	blob \| history
gradle.properties	patch \|	diff1 \|	diff2 \|	blob \| history