Merge branch 'develop' into features/JAL-3010ontologyFeatureSettings
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Sat, 20 Apr 2019 07:40:22 +0000 (08:40 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Sat, 20 Apr 2019 07:40:22 +0000 (08:40 +0100)
commit9fcb12165750b20f8a73d0bb976b22be5fda94a2
treebc531de68498d7accb8ea38e1098c0aded8ae4d3
parent3feccfbec4fb7e295d75b6dc8df60cc59c34f624
parent15c6c6724878a5445e9f5bc6594719dbe81c1735
Merge branch 'develop' into features/JAL-3010ontologyFeatureSettings

Conflicts:
src/jalview/controller/AlignViewController.java
resources/lang/Messages.properties
resources/lang/Messages_es.properties
src/jalview/controller/AlignViewController.java
src/jalview/gui/FeatureSettings.java