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

Browse Source

Conflicts:
	htdocs/adherents/document.php
	htdocs/comm/propal/apercu.php
	htdocs/comm/propal/document.php
	htdocs/commande/apercu.php
	htdocs/commande/document.php
	htdocs/compta/facture/apercu.php
	htdocs/compta/facture/document.php
	htdocs/compta/facture/impayees.php
	htdocs/compta/prelevement/bon.php
	htdocs/fourn/commande/document.php
	htdocs/fourn/facture/document.php
	htdocs/imports/import.php
	htdocs/projet/document.php
	htdocs/projet/tasks/document.php

...

This commit is contained in:

Regis Houssin 2011-10-24 13:06:55 +02:00

parent 56d6cbe56f 82f5d8278e

commit 87ff36e3c8

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