Merge branch 'develop' into merge/JAL-3127
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 11 Mar 2019 15:07:39 +0000 (15:07 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 11 Mar 2019 15:07:39 +0000 (15:07 +0000)
commit8aa94d348698138bb5c30715ef0aa15349f47fbb
tree327069351f5ae9e20b9afe238f203f98e6398575
parent16d109024847af92482237e43f99b82fd997451a
parenta510e9b4726214441e4fdac8a1d6752263c4c73d
Merge branch 'develop' into merge/JAL-3127

Conflicts:
src/jalview/viewmodel/AlignmentViewport.java
src/jalview/project/Jalview2XML.java
src/jalview/viewmodel/AlignmentViewport.java
test/jalview/project/Jalview2xmlTests.java