Merge branch 'feature/JAL-3144noJTree' into
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 1 Nov 2018 11:32:20 +0000 (11:32 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 1 Nov 2018 11:32:20 +0000 (11:32 +0000)
commite58d21a916e1beda1091e286723afb494ab62cc3
tree7c173b6785646a0135612c5b542b78f5272db103
parentb7791df75a2e535cfe438e85b101918eedeb71dc
parent181cd6607ecd631aa5972582ff1d99c5bea75b23
Merge branch 'feature/JAL-3144noJTree' into
Jalview-BH/JAL-3026-JAL-3063-JAXB

Conflicts:
src/jalview/ext/ensembl/EnsemblRestClient.java
src/jalview/fts/service/pdb/PDBFTSRestClient.java
src/jalview/fts/service/uniprot/UniProtFTSRestClient.java