Merge branch 'develop' into bug/JAL-2323disulfideOverview
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 21 Nov 2016 11:02:04 +0000 (11:02 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 21 Nov 2016 11:02:04 +0000 (11:02 +0000)
commitfbc92d8f171f75002890bfa0ea1f436f7125d3b5
treeef36384693267d6eb18acf41f301b32ef37922de
parent2466e94aa67b0559bd5c4c6e17d60b6fac3cb756
parent2fe4506613e52647dd9374151898ded61ea275df
Merge branch 'develop' into bug/JAL-2323disulfideOverview

Conflicts:
src/jalview/io/SequenceAnnotationReport.java
src/jalview/io/SequenceAnnotationReport.java