From d499dc50348566c9af91568e64d2ec1498df4594 Mon Sep 17 00:00:00 2001 From: David Grudl Date: Mon, 5 May 2014 03:09:47 +0200 Subject: [PATCH] opened 2.2 --- composer.json | 7 +------ readme.md | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index 79a9517f..7369e212 100644 --- 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 index 748c49c3..ad62b91d 100644 --- 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.