Merge branch 'releases/Release_2_10_2b1_Branch' into develop
authorJim Procter <jprocter@issues.jalview.org>
Tue, 3 Oct 2017 14:25:34 +0000 (15:25 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Tue, 3 Oct 2017 14:25:34 +0000 (15:25 +0100)
commit3ac6f45c254aaafa6bdf163bf66bb4031de21fa3
tree0387fc4d044a10f6bb6e959de238e8b255e405a0
parentb3ad9eb10b8d77634a5dae103fa0d0834e6ffe6a
parent25810fa9ca78f73d8ec335569d4f0860ef04e7de
Merge branch 'releases/Release_2_10_2b1_Branch' into develop

 Conflicts:
help/html/releases.html
help/html/whatsNew.html
src/jalview/ws/dbsources/Uniprot.java
help/html/releases.html