Laurent Destailleur dce9b96260 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ...

develop

Conflicts:
	htdocs/core/lib/functions2.lib.php
	htdocs/install/lib/repair.lib.php
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql

2012-07-25 12:20:45 +02:00

..

doc

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into

2012-07-25 12:20:45 +02:00

mod_codeclient_elephant.php

Doxygen

2012-03-19 17:18:11 +01:00

mod_codeclient_leopard.php

Doxygen

2012-03-17 01:13:10 +01:00

mod_codeclient_monkey.php

Fix: avoid warning in php strict mode

2012-03-23 16:44:45 +01:00

mod_codecompta_aquarium.php

Doxygen

2012-03-19 17:18:11 +01:00

mod_codecompta_panicum.php

Fix: Panicum module for supplier accountancy code

2012-06-28 19:51:25 +02:00

modules_societe.class.php

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into

2012-07-25 12:20:45 +02:00