projects / enc-live.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ccb41ae c889fc8)
Merge branch 'master' into live
authorThérèse Godefroy <godef.th@free.fr>
Wed, 20 Sep 2017 07:47:13 +0000 (09:47 +0200)
committerThérèse Godefroy <godef.th@free.fr>
Wed, 20 Sep 2017 07:47:13 +0000 (09:47 +0200)
1  2 
en/index.html patch | diff1 | diff2 | blob | history

diff --cc en/index.html
Simple merge