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

2013-09-04 18:56:32 +02:00
parent 161c612c02 6b2492b62c
commit d5a25f063f
4 changed files with 514 additions and 81 deletions
@@ -25,6 +25,7 @@

 <script>
 	var dashboard_ajax_url = '{$link->getAdminLink('AdminDashboard')}';
+	var no_results_translation = '{l s='No result'}';
 </script>

 <div class="page-head">