From: Ben Soares <b.soares@dundee.ac.uk>
Date: Wed, 23 Sep 2020 16:19:01 +0000 (+0100)
Subject: Merge branch 'develop' into bug/JAL-3753_resources_duplicated_in_jalview_jar
X-Git-Tag: Develop-2_11_2_0-d20201215~24^2~2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=aa7e98db16b72e10b09e8897a382e5cbb5ca0012;hp=-c;p=jalview.git

Merge branch 'develop' into bug/JAL-3753_resources_duplicated_in_jalview_jar
---

aa7e98db16b72e10b09e8897a382e5cbb5ca0012