Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5

This commit is contained in:
Weblate 2013-04-03 18:30:54 +02:00
commit e46b8d6f3d
4 changed files with 6 additions and 4 deletions

View File

@ -1,6 +1,8 @@
phpMyAdmin - ChangeLog
======================
3.5.9.0 (not yet released)
3.5.8.0 (not yet released)
- bug #3828 MariaDB reported as MySQL
- bug #3854 Incorrect header for Safari 6.0

View File

@ -8,7 +8,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
<link rel="icon" href="./favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>phpMyAdmin 3.5.8-dev - Documentation</title>
<title>phpMyAdmin 3.5.9-dev - Documentation</title>
<link rel="stylesheet" type="text/css" href="docs.css" />
</head>
@ -16,7 +16,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
<div id="header">
<h1>
<a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a>
3.5.8-dev
3.5.9-dev
Documentation
</h1>
</div>

2
README
View File

@ -1,7 +1,7 @@
phpMyAdmin - Readme
===================
Version 3.5.8-dev
Version 3.5.9-dev
A set of PHP-scripts to manage MySQL over the web.

View File

@ -98,7 +98,7 @@ class PMA_Config
*/
function checkSystem()
{
$this->set('PMA_VERSION', '3.5.8-dev');
$this->set('PMA_VERSION', '3.5.9-dev');
/**
* @deprecated
*/