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

2013-11-06 10:57:02 +01:00
parent c16c239953 9fa4296a06
commit a890410a64
471 changed files with 3778 additions and 28510 deletions
@@ -506,7 +506,6 @@ class AdminImportControllerCore extends AdminController
 		$this->toolbar_btn = array();

 		// adds fancybox
-		$this->addCSS(_PS_CSS_DIR_.'jquery.fancybox-1.3.4.css', 'screen');
 		$this->addJqueryPlugin(array('fancybox'));

 		$entity_selected = 0;