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

Merge branch 'features/r2_11_2/JAL-3829_3dbeacons' into releases/Release_2_11_2_Branch
---

39e194f4c6a4a9fa94331045bff24e58eabf39a0