git.polytechnique.org Git - platal.git/commit

projects / platal.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 316b40d 9e52f08)

author	Florent Bruneau <florent.bruneau@polytechnique.org>
	Thu, 10 Jul 2008 20:35:46 +0000 (22:35 +0200)
committer	Florent Bruneau <florent.bruneau@polytechnique.org>
	Thu, 10 Jul 2008 20:35:46 +0000 (22:35 +0200)
commit	2925df1bd6cb08c1f29822019fcb82e59f63f8a3
tree	05991169f1872988287b9a6312a8289862f61d30	tree \| snapshot
parent	316b40d60daacd3aa3b480ccba0db6a3d97c093b	commit \| diff
parent	9e52f08637514e420b00ee0fbeb52804e85f3878	commit \| diff

Merge branch 'platal-0.9.17'

Conflicts:

include/banana/forum.inc.php
include/common.inc.php
modules/core.php
modules/marketing.php
plugins/modifier.miniwiki.php

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

classes/xnetpage.php	diff1 \|	diff2 \|	blob \| history
include/banana/forum.inc.php	diff1 \|	diff2 \|	blob \| history
include/banana/moderate.inc.php	diff1 \|	diff2 \|	blob \| history
include/common.inc.php	diff1 \|	diff2 \|	blob \| history
include/vcard.inc.php	diff1 \|	diff2 \|	blob \| history
modules/events.php	diff1 \|	diff2 \|	blob \| history
modules/lists.php	diff1 \|	diff2 \|	blob \| history
modules/marketing.php	diff1 \|	diff2 \|	blob \| history
modules/xnetevents.php	diff1 \|	diff2 \|	blob \| history
templates/xnet/skin.tpl	diff1 \|	diff2 \|	blob \| history

plat/al