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

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

a5fd896e07f08fdb79c0967fed5b74661f8d2984