Merge remote branch 'origin/platal-1.0.0' into platal-1.0.1
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Mon, 25 Oct 2010 12:17:55 +0000 (14:17 +0200)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Mon, 25 Oct 2010 12:17:55 +0000 (14:17 +0200)
commit1c4a1d0a32c52851e9ffbbf585bb206c9a472dc9
tree5dfd752bc5ece78299855db01be30a11fa4c8247
parent325af12b6feb9af4460a0aa7b5bcb6646de10405
parent8f71873e68b6d9a70b08fbdd11eced4203c6cc1f
Merge remote branch 'origin/platal-1.0.0' into platal-1.0.1
modules/carnet.php
templates/xnetevents/admin.tpl