Merge branch '1.6' of github.com:PrestaShop/PrestaShop into 1.6

PrestaShop · Oct 10, 2014 · db66ace · db66ace
2 parents 2f40702 + 391879a
commit db66ace
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...s/default/template/controllers/supply_orders_receipt_history/helpers/list/list_footer.tpl b/...s/default/template/controllers/supply_orders_receipt_history/helpers/list/list_footer.tpl
@@ -36,7 +36,7 @@
 			<i class="process-icon-back{if isset($back_button.class)} {$back_button.class}{/if}" ></i> <span{if isset($back_button.force_desc) && $back_button.force_desc == true } class="locked"{/if}>{$back_button.desc}</span>
 		</a>
 	{/if}
-	<a href="" class="btn btn-default pull-right" onclick="if (confirm('{l s='Update selected items ?'}'))sendBulkAction($(this).closest('form').get(0), 'submitBulkUpdatesupply_order_detail'); return false;">
+	<a href="" class="btn btn-default pull-right" onclick="if (confirm('{l s='Update selected items?'}'))sendBulkAction($(this).closest('form').get(0), 'submitBulkUpdatesupply_order_detail'); return false;">
 		<i class="process-icon-refresh" ></i> <span>{l s='Update selected items'}</span>
 	</a>
 </div>

diff --git a/modules/socialsharing b/modules/socialsharing