Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development

Browse Source

...

This commit is contained in:

Rémi Gaillard committed 2013-01-15 10:20:50 +01:00

2 parents 433a446a35 4af9ddd83f

commit 915244d1b7

1 file changed

+921 -934

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

translations/fr/admin.php

+921 -934

File diff suppressed because it is too large. Load diff