git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: af5bc80 e6322a5)
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)
merging in develop


Trivial merge