Merge remote-tracking branch 'origin/3.4' into develop

Browse Source

Conflicts:
	htdocs/contact/class/contact.class.php
	htdocs/product/stock/mouvement.php

...

This commit is contained in:

Laurent Destailleur 2013-10-10 22:59:22 +02:00

parent 053d5eeff7 f225b35a90

commit ef4970476a

1 changed files with 7 additions and 7 deletions

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