From: Ben Soares <b.soares@dundee.ac.uk>
Date: Mon, 28 Sep 2020 11:12:47 +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~1
X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=commitdiff_plain;h=2d1798c357c64064590a4206e944b740b0539435

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

2d1798c357c64064590a4206e944b740b0539435