Merge remote-tracking branch 'origin/feature/2588' into feature/JAL-2527
authorkiramt <k.mourao@dundee.ac.uk>
Wed, 30 Aug 2017 08:30:11 +0000 (09:30 +0100)
committerkiramt <k.mourao@dundee.ac.uk>
Wed, 30 Aug 2017 08:30:11 +0000 (09:30 +0100)
commita435323c67f5dd67ab887bb0c71cf493d04c9272
tree726832f7b51085db86446e6ba0f7ebb3224907bb
parentd9ec1e848018a92a6d0883b13a25038e279e4ee9
parent9e95025ca7a686639c1acdc630db8edde72ffc61
Merge remote-tracking branch 'origin/feature/2588' into feature/JAL-2527

Conflicts:
src/jalview/renderer/OverviewRenderer.java
src/jalview/renderer/OverviewRenderer.java