opened 2.2

nette · May 11, 2014 · d499dc5 · d499dc5
1 parent 6e325ab
commit d499dc5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/composer.json b/composer.json
@@ -22,10 +22,5 @@
 	"autoload": {
 		"classmap": ["src/"]
 	},
-	"minimum-stability": "dev",
-	"extra": {
-		"branch-alias": {
-			"dev-master": "2.2-dev"
-		}
-	}
+	"minimum-stability": "dev"
 }
diff --git a/readme.md b/readme.md
@@ -2,7 +2,7 @@
 ===============================================
 
 [![Downloads this Month](https://img.shields.io/packagist/dm/nette/neon.svg)](https://packagist.org/packages/nette/neon)
-[![Build Status](https://travis-ci.org/nette/neon.svg?branch=master)](https://travis-ci.org/nette/neon)
+[![Build Status](https://travis-ci.org/nette/neon.svg?branch=v2.2)](https://travis-ci.org/nette/neon)
 
 NEON is very similar to YAML.The main difference is that the NEON supports "entities"
 (so can be used e.g. to parse phpDoc annotations) and tab characters for indentation.