git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6b1f3fb 6d431e1)
Merge branch 'tasks/JAL-3035_remove_dasobert_dependency' into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 6 Mar 2019 15:50:20 +0000 (15:50 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 6 Mar 2019 15:50:20 +0000 (15:50 +0000)
1  2 
resources/lang/Messages.properties patch | diff1 | diff2 | blob | history
resources/lang/Messages_es.properties patch | diff1 | diff2 | blob | history
src/jalview/ws/DBRefFetcher.java patch | diff1 | diff2 | blob | history

diff --cc resources/lang/Messages.properties
Simple merge
diff --cc resources/lang/Messages_es.properties
Simple merge
diff --cc src/jalview/ws/DBRefFetcher.java
Simple merge