git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5b1175a 511a2a9)
Merge branch 'feature/JAL-3692enaEndpoint' into patch/for2.11.2/JAL-3821_ena_rna_moltype
authorJim Procter <jprocter@issues.jalview.org>
Wed, 17 Feb 2021 16:27:55 +0000 (16:27 +0000)
committerJim Procter <jprocter@issues.jalview.org>
Wed, 17 Feb 2021 16:27:55 +0000 (16:27 +0000)
1  2 
resources/lang/Messages.properties patch | diff1 | diff2 | blob | history
resources/lang/Messages_es.properties patch | diff1 | diff2 | blob | history

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