projects / platal.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 325af12 8f71873)
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)
1  2 
modules/carnet.php patch | diff1 | diff2 | blob | history
templates/xnetevents/admin.tpl patch | diff1 | diff2 | blob | history

diff --cc modules/carnet.php
Simple merge
diff --cc templates/xnetevents/admin.tpl
Simple merge
plat/al