Laurent Destailleur fc3483a4bb Merge remote-tracking branch 'origin/3.3' into develop ... Conflicts: htdocs/webservices/server_user.php		2013-03-12 14:55:13 +01:00
..
bilan.php	Prepare move to other licence. For the moment all answers for licence	2013-01-16 15:36:08 +01:00
clientfourn.php	Prepare move to other licence. For the moment all answers for licence	2013-01-16 15:36:08 +01:00
compteres.php	Prepare move to other licence. For the moment all answers for licence	2013-01-16 15:36:08 +01:00
index.php	Merge remote-tracking branch 'origin/3.3' into develop	2013-03-12 14:55:13 +01:00