bumped version to 1.2.0-DEV

97ae06e8 · Fabien Potencier · b3a7beef · 97ae06e8 · 97ae06e8 · 97ae06e8
Commit 97ae06e8 authored Oct 11, 2013 by Fabien Potencier
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 2 deletions

composer.json composer.json +1 -1

doc/changelog.rst doc/changelog.rst +5 -0

src/Silex/Application.php src/Silex/Application.php +1 -1

No files found.
--- a/composer.json
+++ b/composer.json
@@ -57,7 +57,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "1.1.x-dev"
+            "dev-master": "1.2.x-dev"
        }
    }
 }
--- a/doc/changelog.rst
+++ b/doc/changelog.rst
 Changelog
 =========

+1.2.0 (2013-XX-XX)
+------------------
+
+* n/a
+
 1.1.1 (2013-10-11)
 ------------------


--- a/src/Silex/Application.php
+++ b/src/Silex/Application.php
@@ -42,7 +42,7 @@ use Silex\EventListener\StringToResponseListener;
 */
 class Application extends \Pimple implements HttpKernelInterface, TerminableInterface
 {
-    const VERSION = '1.1.1';
+    const VERSION = '1.2.0-DEV';

    const EARLY_EVENT = 512;
    const LATE_EVENT  = -512;