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

ChangeLog

@@ -1,7 +1,9 @@
 phpMyAdmin - ChangeLog
 ======================
 
-4.8.0 (not yet released)
+4.8.1 (not yet released)
+
+4.8.0 (2018-04-07)
 - issue #12946 Allow to export JSON with unescaped unicode chars
 - issue #12983 Disable login button without solved reCaptcha
 - issue #12315 Allow to remove individual segments from pie charts
@@ -46,8 +48,6 @@ phpMyAdmin - ChangeLog
 - issue #13466 Better utilization of user preferences
 - issue #14042 Rename PMD to Designer
 - issue #13940 Honor arg_separator in AJAX requests
-
-4.7.10 (not yet released)
 - issue #14060 Can't edit rows in Internet Explorer
 - issue #14096 Internet Explorer compatibility; fixes JavaScript error Object doesn't support property or method 'startsWith'
 

README

@@ -1,7 +1,7 @@
 phpMyAdmin - Readme
 ===================
 
-Version 4.8.0-rc1
+Version 4.8.1-dev
 
 A web interface for MySQL and MariaDB.
 

doc/conf.py

@@ -51,7 +51,7 @@ copyright = u'2012 - 2018, The phpMyAdmin devel team'
 # built documents.
 #
 # The short X.Y version.
-version = '4.8.0-rc1'
+version = '4.8.1-dev'
 # The full version, including alpha/beta/rc tags.
 release = version
 

libraries/classes/Config.php

@@ -116,7 +116,7 @@ class Config
      */
     public function checkSystem()
     {
-        $this->set('PMA_VERSION', '4.8.0-rc1');
+        $this->set('PMA_VERSION', '4.8.1-dev');
         /* Major version */
         $this->set(
             'PMA_MAJOR_VERSION',