filefunc.inc.php

11 years ago

Merge remote-tracking branch 'origin/3.4' into 3.5 · 0bdcda50

Laurent Destailleur authored 11 years ago

Conflicts:
	ChangeLog
	build/exe/doliwamp/doliwamp.iss
	build/pad/pad_dolibarr.xml
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec

0bdcda50

History

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

Laurent Destailleur authored 11 years ago

Conflicts:
	ChangeLog
	build/exe/doliwamp/doliwamp.iss
	build/pad/pad_dolibarr.xml
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec