// MERGE with 1.4 r7770

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7776 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-28 09:20:57 +00:00
parent df255f66c1
commit a875fecb20
968 changed files with 26082 additions and 3937 deletions
@@ -63,6 +63,7 @@ if ($tmp = strpos($_SERVER['REQUEST_URI'], '?'))
 $_SERVER['REQUEST_URI'] = str_replace('//', '/', $_SERVER['REQUEST_URI']);

 define('INSTALL_VERSION', '1.5.0.0');
+
 define('PS_INSTALLATION_IN_PROGRESS', true);
 include_once(INSTALL_PATH.'/classes/ToolsInstall.php');
 define('SETTINGS_FILE', INSTALL_PATH.'/../config/settings.inc.php');