Laurent Destailleur bf9b255c92 Merge remote-tracking branch 'origin/3.3' into 3.4 ...

Conflicts:
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_opensuse.spec

2013-07-24 15:25:00 +02:00

..

doc_generic_order_odt.modules.php

Implement MAIN_DOC_USE_TIMING into project and order ODT

2013-04-26 08:48:44 +02:00

pdf_einstein.modules.php

Merge remote-tracking branch 'origin/3.3' into 3.4

2013-07-24 15:25:00 +02:00