Merge branch 'feature/JAL-3143ensemblJSON' into trialMerge
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 29 Jan 2019 11:32:18 +0000 (11:32 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 29 Jan 2019 11:32:18 +0000 (11:32 +0000)
commit212a3358f824e06b94742b49676b07a69028b159
tree1593609613a88a0b07760477afa867dbda0823c9
parenteb0ecbb41335d28ac4c38fe617f69c0ffc51fea5
parent783fbd0b01eea0b485a8664221413ef5ade10e21
Merge branch 'feature/JAL-3143ensemblJSON' into trialMerge

Conflicts:
src/jalview/ext/ensembl/EnsemblFeatures.java
src/jalview/analysis/AlignmentUtils.java
src/jalview/ext/ensembl/EnsemblFeatures.java