From: Jim Procter <j.procter@dundee.ac.uk>
Date: Fri, 1 Oct 2021 11:31:45 +0000 (+0100)
Subject: Merge branch 'features/r2_11_2/JAL-3829_3dbeacons' into develop
X-Git-Tag: Release_2_11_2_0~30^2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=7d69b23263d8a00ca20c0bb4ff2c8f4f3a9e6c0c;p=jalview.git

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

7d69b23263d8a00ca20c0bb4ff2c8f4f3a9e6c0c