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

This commit is contained in:
Jerome Nadaud
2013-10-15 19:14:51 +02:00
74 changed files with 267 additions and 269 deletions
@@ -242,8 +242,6 @@
}
}
});
click = 2;
},
click: function(e) {