Skip to content

Commit

Permalink
Merge branch '2.1' into 2.2
Browse files Browse the repository at this point in the history
Signed-off-by: crynobone <[email protected]>

Conflicts:
	README.md
  • Loading branch information
crynobone committed May 26, 2014
2 parents e92a5fd + cdeda7b commit 03dd639
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Orchestra Platform Support Component

[![Latest Stable Version](https://poser.pugx.org/orchestra/support/v/stable.png)](https://packagist.org/packages/orchestra/support)
[![Total Downloads](https://poser.pugx.org/orchestra/support/downloads.png)](https://packagist.org/packages/orchestra/support)
[![Build Status](https://travis-ci.org/orchestral/support.png?branch=2.2)](https://travis-ci.org/orchestral/support)
[![Build Status](https://travis-ci.org/orchestral/support.svg?branch=2.2)](https://travis-ci.org/orchestral/support)
[![Coverage Status](https://coveralls.io/repos/orchestral/support/badge.png?branch=2.2)](https://coveralls.io/r/orchestral/support?branch=2.2)
[![Scrutinizer Quality Score](https://scrutinizer-ci.com/g/orchestral/support/badges/quality-score.png?s=80403bdb1e88f15e75c62eca92316227e08176c3)](https://scrutinizer-ci.com/g/orchestral/support/)

Expand Down

0 comments on commit 03dd639

Please sign in to comment.