Merge remote-tracking branch 'refs/remotes/origin/develop'

lalbert · Jun 29, 2016 · 418300a · 418300a
2 parents 7818a05 + d5c6a8f
commit 418300a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -27,7 +27,7 @@
 		}
 	],
 	"require" : {
-		"magento/framework" : "100.0.*"
+		"magento/framework" : "~100"
 	},
 	"require-dev" : {
 		"phpunit/phpunit" : "~4.8"
@@ -42,4 +42,4 @@
 			"dev-master" : "1.0-dev"
 		}
 	}
-}
+}