From: Jim Procter <j.procter@dundee.ac.uk>
Date: Wed, 15 Sep 2021 06:34:28 +0000 (+0100)
Subject: Merge branch 'features/r2_11_2/JAL-3829_3dbeacons' into develop
X-Git-Tag: Release_2_11_2_0~35^2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=2f8e3fb6186c69af8559ac0ca151a338044c320d;p=jalview.git

Merge branch 'features/r2_11_2/JAL-3829_3dbeacons' into develop
---

2f8e3fb6186c69af8559ac0ca151a338044c320d