Merge remote-tracking branch 'origin/releases/Release_2_10_4_Branch' into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 16 Mar 2018 15:03:11 +0000 (15:03 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 16 Mar 2018 15:03:11 +0000 (15:03 +0000)
commitc697eb1e696468bddf7c976a85528fbedbebfbd6
tree21b637ad91b4fc41c9dc996c9ae9f8f8e3376f52
parent7d6fd8e1601086ff43abb35151339d12e2b99141
parent77b4f2ace6bde7f7c41199e74b3099337384ee4d
Merge remote-tracking branch 'origin/releases/Release_2_10_4_Branch' into develop

Conflicts:
src/jalview/ext/ensembl/EnsemblLookup.java
src/jalview/ext/ensembl/EnsemblLookup.java
src/jalview/gui/FeatureSettings.java
test/jalview/io/CrossRef2xmlTests.java