Merge pull request #79 from DataValues/rel024

JeroenDeDauw · web-flow · commit c99e06ffe1cf · 2018-08-16T10:16:18.000+02:00
0.4.2: support DV 2.x on 0.4.x branch
diff --git a/Common.php b/Common.php
@@ -15,4 +15,4 @@
 	return 1;
 }
 
-define( 'DATAVALUES_COMMON_VERSION', '0.4.1' );
+define( 'DATAVALUES_COMMON_VERSION', '0.4.2' );
diff --git a/composer.json b/composer.json
@@ -24,12 +24,12 @@
 	},
 	"require": {
 		"php": ">=5.3.0",
-		"data-values/data-values": "~1.0|~0.1",
+		"data-values/data-values": "~2.0|~1.0|~0.1",
 		"data-values/interfaces": "~0.2.0|^0.1.5"
 	},
 	"extra": {
 		"branch-alias": {
-			"dev-master": "0.3.x-dev"
+			"dev-master": "0.4.x-dev"
 		}
 	},
 	"autoload": {

Original file line number	Diff line number	Diff line change
`@@ -15,4 +15,4 @@`
`15`	`15`	`return 1;`
`16`	`16`	`}`
`17`	`17`
`18`		`-define( 'DATAVALUES_COMMON_VERSION', '0.4.1' );`
	`18`	`+define( 'DATAVALUES_COMMON_VERSION', '0.4.2' );`