projects / enc-live.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0ffc05a 1b061eb)
Merge branch 'master' of vcs.fsf.org:enc
authorlenieto3 <lenieco@gmail.com>
Tue, 24 Jun 2014 18:39:03 +0000 (13:39 -0500)
committerlenieto3 <lenieco@gmail.com>
Tue, 24 Jun 2014 18:39:03 +0000 (13:39 -0500)
defenza -> defensa

1  2 
es/confirmation.html patch | diff1 | diff2 | blob | history
es/index.html patch | diff1 | diff2 | blob | history

diff --cc es/confirmation.html
Simple merge
diff --cc es/index.html
Simple merge