Merge branch 'develop' of https://source.jalview.org/git/jalview.git into kjvdh/featu...
authorkjvdheide <kjvanderheide@dundee.ac.uk>
Mon, 29 Jan 2018 17:42:12 +0000 (17:42 +0000)
committerkjvdheide <kjvanderheide@dundee.ac.uk>
Mon, 29 Jan 2018 17:42:12 +0000 (17:42 +0000)
commita917afad91eabddd9c3e2270bac7ed9b7202f4b6
treeb4731375b4fb425840f861b3e87e21489c3782e4
parent0eb215aea41fe7d20c16508a9264e1bf9a290f24
parent82cba0a99ac7c16b89e8399adb158e6a063fecd3
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into kjvdh/features/CipresWebservices