git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: abae9d3 465a6cd)
Merge branch 'bug/JAL-2609attemptedmerge' into develop
authorJim Procter <jprocter@issues.jalview.org>
Mon, 23 Oct 2017 15:37:29 +0000 (16:37 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Mon, 23 Oct 2017 15:37:29 +0000 (16:37 +0100)

Trivial merge