From: Jim Procter <j.procter@dundee.ac.uk>
Date: Mon, 13 Sep 2021 16:22:10 +0000 (+0100)
Subject: Merge branch 'features/r2_11_2/JAL-3829_3dbeacons' into develop
X-Git-Tag: Release_2_11_2_0~39
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=18344fcaeb3ee1c80b1c1de907ebe24f1ead18e4;hp=29538a14c49fcd47f00f1d2fff51f357b8e0388e;p=jalview.git

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