Merge remote-tracking branch 'origin/master'

This commit is contained in:
Pootle server 2011-06-09 22:40:05 +02:00
commit 52f0c0031a

View File

@ -81,7 +81,7 @@ if (is_array($foreignData['disp_row'])) {
<head>
<title>phpMyAdmin</title>
<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $charset; ?>" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="stylesheet" type="text/css"
href="phpmyadmin.css.php?<?php echo PMA_generate_common_url('', ''); ?>&amp;js_frame=right&amp;nocache=<?php echo $GLOBALS['PMA_Config']->getThemeUniqueValue(); ?>" />
<?php