Merge pull request #7 from DataValues/102

thiemowmde · thiemowmde · commit f51978a1abb9 · 2014-10-10T09:51:44.000+02:00
Made component installable together with DataValues 1.x and bumped to 1.0.2
diff --git a/README.md b/README.md
@@ -49,6 +49,10 @@ as [Wikimedia Germany](https://wikimedia.de) employee for the [Wikidata project]
 
 ## Release notes
 
+### 1.0.2 (2014-10-10)
+
+* Made component installable together with DataValues 1.x
+
 ### 1.0.1 (2014-09-09)
 
 * Handle IllegalValueException in DataValueDeserializer
diff --git a/composer.json b/composer.json
@@ -24,13 +24,18 @@
 	},
 	"require": {
 		"php": ">=5.3.0",
-		"data-values/data-values": "~0.1.0",
+		"data-values/data-values": "~1.0|~0.1",
 		"serialization/serialization": "~3.0"
 	},
 	"autoload": {
 		"psr-4": {
 			"DataValues\\Serializers\\": "src/Serializers",
 			"DataValues\\Deserializers\\": "src/Deserializers"
 		}
+	},
+	"extra": {
+		"branch-alias": {
+			"dev-master": "1.0.x-dev"
+		}
 	}
 }
