diff --git a/ChangeLog b/ChangeLog index 3703d4537498..ec1b284aa3a6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ phpMyAdmin - ChangeLog ====================== +4.2.1.0 (not yet released) + 4.2.0.0 (not yet released) + rfe #1403 Export only triggers + rfe #1483 Export Server/Database/Table without triggers diff --git a/README b/README index d49f07850cbd..a0ea7470da0b 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 4.2.0-beta1 +Version 4.2.1-dev A set of PHP-scripts to manage MySQL over the web. diff --git a/doc/conf.py b/doc/conf.py index 64cbefe30153..84fdb09e0390 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -51,7 +51,7 @@ # built documents. # # The short X.Y version. -version = '4.2.0-beta1' +version = '4.2.1-dev' # The full version, including alpha/beta/rc tags. release = version diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 57aa3136039d..3c94822e456c 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -114,7 +114,7 @@ function __construct($source = null) */ function checkSystem() { - $this->set('PMA_VERSION', '4.2.0-beta1'); + $this->set('PMA_VERSION', '4.2.1-dev'); /** * @deprecated */