Merge branch '2.2'

keradus · keradus · commit 6d2f124c9fa3 · 2017-04-25T22:20:13.000+02:00
Conflicts:
	src/Console/Application.php
diff --git a/src/Console/Application.php b/src/Console/Application.php
@@ -26,7 +26,7 @@
  */
 final class Application extends BaseApplication
 {
-    const VERSION = '2.3.0';
+    const VERSION = '2.3.1-DEV';
 
     /**
      * Constructor.

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`*/`
`27`	`27`	`final class Application extends BaseApplication`
`28`	`28`	`{`
`29`		`- const VERSION = '2.3.0';`
	`29`	`+ const VERSION = '2.3.1-DEV';`
`30`	`30`
`31`	`31`	`/**`
`32`	`32`	`* Constructor.`