projects / enc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7e60af0 f65fbc2)
Merge branch 'master' of vcs.fsf.org:enc
authorAna Isabel Carvalho <ana.isabelc@gmail.com>
Thu, 5 Jun 2014 00:15:15 +0000 (01:15 +0100)
committerAna Isabel Carvalho <ana.isabelc@gmail.com>
Thu, 5 Jun 2014 00:15:15 +0000 (01:15 +0100)
Conflicts:
static

1  2 
index.html patch | diff1 | diff2 | blob | history
infographic.html patch | diff1 | diff2 | blob | history

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