// test git

Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Conflicts: controllers/admin/AdminImportController.php
2013-11-28 14:29:34 +01:00
parent 8f5bac0e90 cb9d00352f
commit 8848ff08d8
2 changed files with 2 additions and 1 deletions
@@ -146,6 +146,7 @@
 						$('#csv_file_uploader').hide();
 						$('#csv_files_history').hide();
 					}
+					
 					function csv_unselect() {
 						$('#csv_file_selected').hide();
 						$('#csv_file_uploader').show();