git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: db42c5b 6e0b6fc)
Merge branch 'features/r2_11_2/JAL-3829_3dbeacons' into develop
authorJim Procter <j.procter@dundee.ac.uk>
Tue, 14 Sep 2021 16:24:39 +0000 (17:24 +0100)
committerJim Procter <j.procter@dundee.ac.uk>
Tue, 14 Sep 2021 16:24:39 +0000 (17:24 +0100)

Trivial merge