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

Browse Source

develop

Conflicts:
	htdocs/adherents/index.php

...

This commit is contained in:

Laurent Destailleur 2011-10-25 23:52:38 +02:00

parent 79b12d987f bd754148a7

commit 75a90e8fe9

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