projects / enc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 625c80f 7ae70ba)
Merge branch 'master' of vcs.fsf.org:enc
authorLucas Teixeira <lucas@lucasteixeira.com>
Mon, 23 Jun 2014 22:59:20 +0000 (19:59 -0300)
committerLucas Teixeira <lucas@lucasteixeira.com>
Mon, 23 Jun 2014 22:59:20 +0000 (19:59 -0300)
Conflicts:
pt-br/infographic.html

1  2 
pt-br/infographic.html patch | diff1 | diff2 | blob | history

diff --cc pt-br/infographic.html
Simple merge
Unnamed repository; edit this file 'description' to name the repository.