projects / enc-live.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f44dd62 f87ea50)
Merge branch 'master' of vcs.fsf.org:enc
authorAna Isabel Carvalho <ana.isabelc@gmail.com>
Wed, 4 Jun 2014 19:27:59 +0000 (20:27 +0100)
committerAna Isabel Carvalho <ana.isabelc@gmail.com>
Wed, 4 Jun 2014 19:27:59 +0000 (20:27 +0100)
1  2 
index.html patch | diff1 | diff2 | blob | history

diff --cc index.html
Simple merge