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

Browse Source

Conflicts:
	htdocs/adherents/index.php

...

This commit is contained in:

Laurent Destailleur 2012-08-26 13:13:37 +02:00

parent 3ab014e5c0 4e537a986b

commit 41d047e3b2

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