Merge branch 'develop' into task/JAL-3348_document_cli_memory_settings_when_launching...
authorBen Soares <bsoares@dundee.ac.uk>
Thu, 4 Jul 2019 00:04:51 +0000 (01:04 +0100)
committerBen Soares <bsoares@dundee.ac.uk>
Thu, 4 Jul 2019 00:04:51 +0000 (01:04 +0100)
commitab6545b7fa685f046bbb2ee5217a9e89700f3871
tree15c329599d7cdb0872eedb683b677550466912db
parentab1dce80c1a6f45b2071016f1ce07a3466d81a2e
parent221a20bd20c7c038f18b7f341765165e8c80ca01
Merge branch 'develop' into task/JAL-3348_document_cli_memory_settings_when_launching_jalview

merging in develop