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

2013-11-25 17:17:15 +01:00
parent fae1fd58a9 2b0224efe1
commit 0e3504f3b3
33 changed files with 218 additions and 83 deletions
@@ -57,7 +57,7 @@
 							},
 							function(res)
 							{
-								$('#categories-treeview').parent().html(res);
+								$('#categories-tree').parent().parent().html(res);
 							}
 						);
 					});