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

Browse Source

Conflicts:
	htdocs/compta/facture.php

...

This commit is contained in:

Regis Houssin 2011-11-25 17:15:01 +01:00

parent 2ce2c94f5d 3fb1db1cf2

commit 3ce6a01c85

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