git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f475745 6d8f35f)
Merge branch 'develop' into task/JAL-3141_JAL-3247_merge
authorBen Soares <bsoares@dundee.ac.uk>
Tue, 28 May 2019 11:14:51 +0000 (12:14 +0100)
committerBen Soares <bsoares@dundee.ac.uk>
Tue, 28 May 2019 11:14:51 +0000 (12:14 +0100)
updating merge

1  2 
resources/lang/Messages_es.properties patch | diff1 | diff2 | blob | history

diff --cc resources/lang/Messages_es.properties
Simple merge