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

Browse Source

Conflicts:
	htdocs/core/menus/standard/eldy.lib.php

...

This commit is contained in:

Laurent Destailleur

2012-04-20 12:50:46 +02:00

parent 62fa57da52 55b963c047

commit 829de6b062

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available