 Damien Metzger
|
39f6a2354a
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
classes/helper/HelperForm.php
classes/helper/HelperUploader.php
|
2013-10-25 18:58:07 +02:00 |
|
|
Damien Metzger
|
03857c0576
|
[*] BO : you can know download the previous file near the upload file input
|
2013-10-25 18:55:25 +02:00 |
|
|
Jerome Nadaud
|
f89c8ed008
|
// Fix HelperUploader images params
|
2013-10-25 15:54:53 +02:00 |
|
|
Jerome Nadaud
|
52795495bd
|
//Starting Uploader helper
|
2013-10-25 14:19:51 +02:00 |
|