Laurent Destailleur 11d1be882c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/contrat/list.php		2014-10-04 17:32:01 +02:00
..
index.html	Fix: add generic doc and use doc dir instead pdf	2014-09-25 12:44:57 +02:00
pdf_typhon.modules.php	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into	2014-10-04 17:32:01 +02:00