Merge branch 'platal-0.10.0'
authorVincent Zanotti <vincent.zanotti@m4x.org>
Tue, 12 May 2009 00:13:42 +0000 (02:13 +0200)
committerVincent Zanotti <vincent.zanotti@m4x.org>
Tue, 12 May 2009 00:13:42 +0000 (02:13 +0200)
Signed-off-by: Vincent Zanotti <vincent.zanotti@m4x.org>
1  2 
core
include/validations/paiements.inc.php
modules/admin.php
modules/axletter.php

diff --cc core
--- 1/core
--- 2/core
+++ b/core
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit e8ddc3f28701273de2b5c0f822146ab2a39dea91
 -Subproject commit d7dd3bd88b07c6b49c48fd90ab741de025978177
++Subproject commit b39f2e65166eb3d1b6ce180c85b9b809dd689839
Simple merge
Simple merge
Simple merge