Kevin Granger aa95454c4e Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap ...

Conflicts:
	admin-dev/themes/default/template/controllers/images/content.tpl

2013-10-22 10:07:03 +02:00

..

ajaxfilemanager

…

autoupgrade

…

backups

…

export

…

import

…

tabs

…

themes

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

2013-10-22 10:07:03 +02:00

ajax_products_list.php

…

ajax-tab.php

…

ajax.php

…

backup.php

…

cron_currency_rates.php

…

displayImage.php

…

drawer.php

…

footer.inc.php

…

functions.php

…

get-file-admin.php

…

grider.php

…

header.inc.php

…

index.php

…

init.php

…

login.php

…

password.php

…

pdf.php

…

searchcron.php

…

uploadProductFile.php

…

uploadProductFileAttribute.php

…