Merge branch 'develop' of https://source.jalview.org/git/jalview.git into kjvdh/featu...
authorkjvdheide <kjvanderheide@dundee.ac.uk>
Fri, 12 Jan 2018 15:45:47 +0000 (15:45 +0000)
committerkjvdheide <kjvanderheide@dundee.ac.uk>
Fri, 12 Jan 2018 15:45:47 +0000 (15:45 +0000)
commit9fdb65ed10ce0b70bed3b61fb50704bba294b243
tree6d1c71df9cb5e20d29262afefdafcd9e24938df0
parent834397b07c248ce9f5d55a8a67e41d4c4f52a407
parenteb1d35126a56bdde999364c78e9db854278e5943
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into kjvdh/features/PhylogenyViewer