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

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

c3cc667a8d51694557d6af1dcd2cd1fa5047f83a