Merge branch 'Jalview-BH/JAL-3026' into
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 1 Nov 2018 10:33:35 +0000 (10:33 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 1 Nov 2018 10:33:35 +0000 (10:33 +0000)
commitb7791df75a2e535cfe438e85b101918eedeb71dc
tree0a40968fff69af8204d94e835f5f69fef293909b
parent3204b64d49f0df0ddc001937db0c129cea218672
parentf20ff42eac30f33cb69635ba3217a6224dbeb555
Merge branch 'Jalview-BH/JAL-3026' into
Jalview-BH/JAL-3026-JAL-3063-JAXB

Conflicts:
src/jalview/ext/ensembl/EnsemblRestClient.java
src/jalview/gui/Desktop.java
src/jalview/gui/UserDefinedColours.java
src/jalview/jbgui/GDesktop.java
src/jalview/ext/ensembl/EnsemblRestClient.java
src/jalview/gui/Desktop.java
src/jalview/gui/FeatureSettings.java
src/jalview/gui/UserDefinedColours.java
src/jalview/jbgui/GDesktop.java