git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4208987 e0f2d37)
Merge branch 'develop' into Jalview-JS/develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 25 Mar 2019 16:37:39 +0000 (16:37 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 25 Mar 2019 16:37:39 +0000 (16:37 +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