Laurent Destailleur 298ba17e8f Merge remote-tracking branch 'origin/3.3' into develop ... Conflicts: htdocs/exports/class/export.class.php htdocs/webservices/server_user.php		2013-03-15 01:10:56 +01:00
..
class	Merge remote-tracking branch 'origin/3.3' into develop	2013-03-15 01:10:56 +01:00
export.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-01-16 15:45:17 +01:00