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

ChangeLog

@@ -1,6 +1,8 @@
 phpMyAdmin - ChangeLog
 ======================
 
+4.7.8 (not yet released)
+
 4.7.7 (2017-12-23)
 - issue #13865 Fixed displaying of formatted numeric values for some locales
 - issue #13856 Ensure datetimepicker is always loaded for datetime fields

README

@@ -1,7 +1,7 @@
 phpMyAdmin - Readme
 ===================
 
-Version 4.7.7
+Version 4.7.8-dev
 
 A web interface for MySQL and MariaDB.
 

doc/conf.py

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

libraries/Config.php

@@ -103,7 +103,7 @@ class Config
      */
     public function checkSystem()
     {
-        $this->set('PMA_VERSION', '4.7.7');
+        $this->set('PMA_VERSION', '4.7.8-dev');
         /**
          * @deprecated
          */