From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Fri, 1 Mar 2019 12:12:04 +0000 (+0000)
Subject: Merge branch 'bug/JAL-3139colocatedFeatures' into develop
X-Git-Tag: Release_2_11_0~17^2~85
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=75d911e3d5e02de2549f025132610bc85300c84d;p=jalview.git

Merge branch 'bug/JAL-3139colocatedFeatures' into develop
---

75d911e3d5e02de2549f025132610bc85300c84d