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

Browse Source

Conflicts:
	htdocs/admin/pdf.php

...

This commit is contained in:

Regis Houssin 2011-12-28 10:21:12 +01:00

parent 3df2810f29 dce5a3e708

commit f422a04b1c

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