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

This commit is contained in:
Jerome Nadaud
2013-11-27 17:57:31 +01:00
4 changed files with 137 additions and 193 deletions
@@ -101,7 +101,6 @@ class AdminThemesControllerCore extends AdminController
public function init()
{
// No cache for auto-refresh uploaded logo
header('Cache-Control: no-cache, must-revalidate');
header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
@@ -123,8 +122,6 @@ class AdminThemesControllerCore extends AdminController
),
),
),
/* TO DO - DESC à revoir*/
'appearance' => array(
'title' => $this->l('Appearance'),
'icon' => 'icon-html5',