Laurent Destailleur ce8d13ead0 Merge remote-tracking branch 'origin/3.5' into develop ...

Conflicts:
	ChangeLog
	build/debian/changelog
	build/doxygen/dolibarr-doxygen.doxyfile
	build/exe/doliwamp/doliwamp.iss
	build/makepack-dolibarr.pl
	build/perl/virtualmin/dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/comm/action/fiche.php
	htdocs/filefunc.inc.php
	htdocs/install/check.php

2014-02-10 00:38:10 +01:00

..

doc

Merge remote-tracking branch 'origin/3.5' into develop

2014-02-10 00:38:10 +01:00

mod_commande_marbre.php

Prepare move to other licence. For the moment all answers for licence

2013-01-16 15:36:08 +01:00

mod_commande_saphir.php

Prepare move to other licence. For the moment all answers for licence

2013-01-16 15:36:08 +01:00

modules_commande.php

Fix: $hookmanager is a global object

2013-01-26 10:35:30 +01:00