Merge branch 'patch-61' of https://github.com/defrance/dolibarr into develop

Browse Source

Conflicts:
	htdocs/core/tpl/contacts.tpl.php
	htdocs/societe/class/societe.class.php

...

This commit is contained in:

Laurent Destailleur 2015-09-05 10:52:35 +02:00

parent 9cf6b824d0 750974ec5c

commit 974ea7cd79

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