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

Conflicts: modules/themeconfigurator/themeconfigurator.php
2013-11-18 14:49:27 +01:00
parent 46dc93fd7e 89c65536d7
commit 2ba5dc18fd
68 changed files with 1072 additions and 861 deletions
@@ -24,7 +24,7 @@
 *}
 <div class="page-head">
 	<h2 class="page-title">
-		{l s='Configure'} : {$module_display_name} ({$module_name}}
+		{l s='Configure:'} {$module_display_name} ({$module_name})
 	</h2>
 	<div class="page-bar toolbarBox">
 		<div class="btn-toolbar">