diff options
| author | Weblate <noreply@weblate.org> | 2016-02-10 19:15:00 +0300 |
|---|---|---|
| committer | Weblate <noreply@weblate.org> | 2016-02-10 19:15:00 +0300 |
| commit | a6ecc52b3d1245a30d270d871992f2fedcf84be6 (patch) | |
| tree | ddbcccfea317292de7febef19508827d442df9d9 | |
| parent | c06ebed2f8f8b86822d5ca1de145615e6ff51cb4 (diff) | |
| parent | c90d5a7485198930e079f464941dfe0235918971 (diff) | |
Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6RELEASE_4_6_0ALPHA1
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | doc/conf.py | 2 | ||||
| -rw-r--r-- | libraries/Config.php | 2 |
3 files changed, 3 insertions, 3 deletions
@@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 4.6.0-alpha +Version 4.6.0-alpha1 A web interface for MySQL and MariaDB. diff --git a/doc/conf.py b/doc/conf.py index 2ec3c0e7c7..c65f080ec6 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -51,7 +51,7 @@ copyright = u'2012 - 2014, The phpMyAdmin devel team' # built documents. # # The short X.Y version. -version = '4.6.0-alpha' +version = '4.6.0-alpha1' # The full version, including alpha/beta/rc tags. release = version diff --git a/libraries/Config.php b/libraries/Config.php index aec1893fe8..b770c2fd59 100644 --- a/libraries/Config.php +++ b/libraries/Config.php @@ -101,7 +101,7 @@ class Config */ public function checkSystem() { - $this->set('PMA_VERSION', '4.6.0-alpha'); + $this->set('PMA_VERSION', '4.6.0-alpha1'); /** * @deprecated */ |