Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop

Browse Source

Conflicts:
	htdocs/product/barcode.php

...

This commit is contained in:

Regis Houssin 2011-11-27 18:46:02 +01:00

parent 98c60c1412 5dd6e177b5

commit f451728b52

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available