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 <crynobone@gmail.com>

Conflicts:
	README.md
  • Loading branch information
crynobone committed Jun 17, 2014
2 parents 67925b5 + f5cefe0 commit 5d76a0c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ This would allow extension (or even packages) to have it's own set of view styli
[![Total Downloads](https://poser.pugx.org/orchestra/view/downloads.png)](https://packagist.org/packages/orchestra/view)
[![Build Status](https://travis-ci.org/orchestral/view.svg?branch=2.2)](https://travis-ci.org/orchestral/view)
[![Coverage Status](https://coveralls.io/repos/orchestral/view/badge.png?branch=2.2)](https://coveralls.io/r/orchestral/view?branch=2.2)
[![Scrutinizer Quality Score](https://scrutinizer-ci.com/g/orchestral/view/badges/quality-score.png?s=2c779ead7d25dc51d1b1dd0a31447e5939d21793)](https://scrutinizer-ci.com/g/orchestral/view/)
[![Scrutinizer Quality Score](https://scrutinizer-ci.com/g/orchestral/view/badges/quality-score.png?b=2.2)](https://scrutinizer-ci.com/g/orchestral/view/)

## Quick Installation

Expand Down
4 changes: 4 additions & 0 deletions docs/changes.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ title: View Change Log

## Version 2.1 {#v2-1}

### v2.1.2 {#v2-1-2}

* Add `php artisan theme:detect` and `php artisan theme:activate` command.

### v2.1.1 {#v2-1-1}

* Implement [PSR-4](https://github.com/php-fig/fig-standards/blob/master/proposed/psr-4-autoloader/psr-4-autoloader.md) autoloading structure.
Expand Down

0 comments on commit 5d76a0c

Please sign in to comment.