Merge remote-tracking branch 'origin/3.7' into 3.8

Browse Source

# Conflicts:
#	htdocs/fourn/commande/card.php

...

This commit is contained in:

Juanjo Menent

2015-09-04 18:17:44 +02:00

parent d19ec89bf1 0016f48fac

commit c29f69101c

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