Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin

Conflicts: libraries/config.values.php
2010-07-26 20:24:57 +02:00
parent 8d24baad94 41bc587ed4
commit 7db978de3f
158 changed files with 70698 additions and 65430 deletions
--- a/setup/lib/index.lib.php
+++ b/setup/lib/index.lib.php
@@ -15,11 +15,6 @@ if (!defined('PHPMYADMIN')) {
    exit;
 }

-/**
- * Load vendor config.
- */
-require_once('./libraries/vendor_config.php');
-
 /**
 * Initializes message list
 */