Merge branch 'develop' into features/JAL-1793VCF
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 26 Jan 2018 14:53:22 +0000 (14:53 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 26 Jan 2018 14:53:22 +0000 (14:53 +0000)
commitd38847f4c9170385c3b4c8fbc5e6f5c95a15a196
tree5f6e04472526dd7b37c51c58f2acb73a862b5c12
parent274dcb86a3d7ab44e051325b7bd38c5a138bf087
parent82cba0a99ac7c16b89e8399adb158e6a063fecd3
Merge branch 'develop' into features/JAL-1793VCF

Conflicts:
resources/lang/Messages.properties
resources/lang/Messages_es.properties
src/jalview/ext/ensembl/EnsemblGene.java
src/jalview/ext/ensembl/EnsemblLookup.java
src/jalview/ext/ensembl/EnsemblSeqProxy.java
resources/lang/Messages.properties
resources/lang/Messages_es.properties
src/jalview/ext/ensembl/EnsemblGene.java
src/jalview/ext/ensembl/EnsemblLookup.java
src/jalview/ext/ensembl/EnsemblSeqProxy.java
src/jalview/ext/ensembl/EnsemblSequenceFetcher.java
src/jalview/ext/ensembl/EnsemblSymbol.java
test/jalview/ext/ensembl/EnsemblSeqProxyTest.java