2
0
forked from Wavyzz/dolibarr
Files
dolibarr-fork/build/exe
Laurent Destailleur e4aaff1de9 Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	build/debian/changelog
	build/makepack-dolibarr.pl
	build/makepack-howto.txt
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/filefunc.inc.php
	htdocs/product/class/product.class.php
2015-05-16 17:01:40 +02:00
..
2015-05-16 16:41:55 +02:00