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

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

75963b5dc3d8eb58b840d5c162de4342e64009c2