Merge pull request #735 from deeky666/bump-version-2.6-DEV

Bump version 2.6.0-DEV

Merge pull request #735 from deeky666/bump-version-2.6-DEV
Bump version 2.6.0-DEV
fd509656 · Marco Pivetta · 6016facd · df1283b0 · fd509656 · fd509656
Commit fd509656 authored Dec 05, 2014 by Marco Pivetta
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

composer.json composer.json +1 -1

Version.php lib/Doctrine/DBAL/Version.php +1 -1

No files found.
--- a/composer.json
+++ b/composer.json
@@ -28,7 +28,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "2.5.x-dev"
+            "dev-master": "2.6.x-dev"
        }
    },
    "archive": {

--- a/lib/Doctrine/DBAL/Version.php
+++ b/lib/Doctrine/DBAL/Version.php
@@ -34,7 +34,7 @@ class Version
    /**
     * Current Doctrine Version.
     */
-    const VERSION = '2.5.0-DEV';
+    const VERSION = '2.6.0-DEV';

    /**
     * Compares a Doctrine version with the current one.