Merge branch 'feature/JAL-3143ensemblJSON' into
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 1 Nov 2018 14:31:16 +0000 (14:31 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 1 Nov 2018 14:31:16 +0000 (14:31 +0000)
commitdcfba29a940c44003581f28e6da481450aa86575
tree2dc247f33cd13a33038b11478d801ec5b95862a6
parentd51078280b17552c46677463d78a38d86ede9946
parent7d455171bbd58d050fc9fc95bffc3a3b0cf60166
Merge branch 'feature/JAL-3143ensemblJSON' into
Jalview-BH/JAL-3026-JAL-3063-JAXB

Conflicts:
src/jalview/gui/FeatureTypeSettings.java
src/jalview/gui/FeatureTypeSettings.java
src/jalview/schemes/FeatureColour.java
test/jalview/schemes/FeatureColourTest.java