Merge remote-tracking branch 'origin/develop' into imp/JAL-2774
authorkiramt <k.mourao@dundee.ac.uk>
Tue, 31 Oct 2017 13:59:31 +0000 (13:59 +0000)
committerkiramt <k.mourao@dundee.ac.uk>
Tue, 31 Oct 2017 13:59:31 +0000 (13:59 +0000)
Conflicts:
src/jalview/gui/SeqCanvas.java


No differences found