git.immae.eu Git - perso/Denise/aventuriers.git/commit

]> git.immae.eu Git - perso/Denise/aventuriers.git/commit

author	Denise sur sakamain <sekhmet@sakamain.(none)>
	Wed, 17 Dec 2014 19:16:11 +0000 (20:16 +0100)
committer	Denise sur sakamain <sekhmet@sakamain.(none)>
	Wed, 17 Dec 2014 19:16:11 +0000 (20:16 +0100)
commit	c4c2b0fc59676da85d8eada1a5cc6d17614ca0c8
tree	58c87d0d86b18ea515c61b3e3833fb91159f3c5f	tree \| snapshot
parent	a3530ed9331cbfd7e7f036bb80df8fdda194f1ac	commit \| diff
parent	8532a7373e2df8689244ec5500c0d4a7bb71e53e	commit \| diff

Merge branch 'master' of immae.eu:perso/Denise/aventuriers

Conflicts:
aventuriers.html
aventuriers.pdf
html/aventuriers.html