git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f03d389 f3809a5)
Merge branch 'patch/JAL-2446_mergeconflictmissed' into develop
authorJim Procter <jprocter@issues.jalview.org>
Mon, 9 Oct 2017 13:47:00 +0000 (14:47 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Mon, 9 Oct 2017 13:47:00 +0000 (14:47 +0100)

Trivial merge