Merge branch 'develop' into task/JAL-3348_document_cli_memory_settings_when_launching...
authorBen Soares <bsoares@dundee.ac.uk>
Wed, 3 Jul 2019 15:24:54 +0000 (16:24 +0100)
committerBen Soares <bsoares@dundee.ac.uk>
Wed, 3 Jul 2019 15:24:54 +0000 (16:24 +0100)
commite417a2cc319e7d17d1ccb92f9d3f8e708a1b1652
treed7bc91d124dad1f3b4726ba6bc2ab2258f42aa15
parentaf5bc802477affd6e7843fc367f8e91a7831f741
parente6322a597de6a9d28819a643a598f5e7d60c0242
Merge branch 'develop' into task/JAL-3348_document_cli_memory_settings_when_launching_jalview

merging in develop