Merge remote-tracking branch 'Upstream/develop' into 5.0-p15

Browse Source

Conflicts:
	htdocs/commande/class/api_orders.class.php

...

This commit is contained in:

aspangaro 2016-09-25 05:45:58 +02:00

parent 922495d72d a7db09c020

commit bac23ce422

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