Merge remote-tracking branch 'origin/fr-3767' into fr-3767

Browse Source

# Conflicts:
#	htdocs/product/price.php

...

This commit is contained in:

Marcos García de La Fuente 2015-11-07 12:31:23 +01:00

parent 45b4122a95 6611cc7018

commit e16555132e

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