projects / platal.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c1bae0a 933d9a4)
Merge branch 'platal-0.9.17'
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 31 Aug 2008 09:25:18 +0000 (11:25 +0200)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 31 Aug 2008 09:25:18 +0000 (11:25 +0200)
Conflicts:

templates/events/rss.tpl
templates/xnetgrp/announce-rss.tpl

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
1  2 
include/validations/nomusage.inc.php patch | diff1 | diff2 | blob | history

diff --cc include/validations/nomusage.inc.php
Simple merge
plat/al