Merge branch 'develop' into features/JAL-2295setChimeraAttributes
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 8 Dec 2016 09:47:55 +0000 (09:47 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 8 Dec 2016 09:47:55 +0000 (09:47 +0000)
1  2 
src/jalview/ext/ensembl/EnsemblSeqProxy.java
src/jalview/ws/sifts/SiftsClient.java

Simple merge