Maxime Kohlhaas 3c7f4a3548 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko862 ... Conflicts: htdocs/admin/system/perf.php		2013-07-11 15:55:33 +02:00
..
doc_generic_shipment_odt.modules.php	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko862	2013-07-11 15:55:33 +02:00
pdf_merou.modules.php	Task # 862 : ODT templates on shipment	2013-07-10 15:54:28 +02:00
pdf_rouget.modules.php	Task # 862 : ODT templates on shipment	2013-07-10 15:54:28 +02:00