eldy e74b07cbff Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/install/mysql/migration/3.3.0-3.4.0.sql		2013-03-06 21:28:50 +01:00
..
class	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into	2013-03-06 21:28:50 +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