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

Browse Source

Conflicts:
	controllers/admin/AdminLogsController.php

...

This commit is contained in:

vAugagneur committed 2013-02-05 09:44:13 +01:00

2 parents 4ef61eb8f8 d39fb8a8e6

commit 7ffa731761

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