]> git.immae.eu Git - perso/Denise/aventuriers.git/commitdiff
projects / perso / Denise / aventuriers.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ae11bdb ffc95c9)
Merge branch 'master' of ip6.immae.eu:perso/Denise/aventuriers
authorDenise sur Titasmo <denise.maurice@normalesup.org>
Sat, 13 Dec 2014 19:55:18 +0000 (20:55 +0100)
committerDenise sur Titasmo <denise.maurice@normalesup.org>
Sat, 13 Dec 2014 19:55:18 +0000 (20:55 +0100)

Trivial merge