Skip to content

Commit

Permalink
Merge branch '3.0' into 3.1
Browse files Browse the repository at this point in the history
# Conflicts:
#	README.md

Signed-off-by: crynobone <crynobone@gmail.com>
  • Loading branch information
crynobone committed May 17, 2015
2 parents 5e5994c + 9f07f6c commit b74cc65
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ Messages Component bring a unified notification support for Laravel and Orchestr
[![Latest Stable Version](https://img.shields.io/github/release/orchestral/messages.svg?style=flat)](https://packagist.org/packages/orchestra/messages)
[![Total Downloads](https://img.shields.io/packagist/dt/orchestra/messages.svg?style=flat)](https://packagist.org/packages/orchestra/messages)
[![MIT License](https://img.shields.io/packagist/l/orchestra/messages.svg?style=flat)](https://packagist.org/packages/orchestra/messages)
[![Build Status](https://img.shields.io/travis/orchestral/messages/master.svg?style=flat)](https://travis-ci.org/orchestral/messages)
[![Coverage Status](https://img.shields.io/coveralls/orchestral/messages/master.svg?style=flat)](https://coveralls.io/r/orchestral/messages?branch=master)
[![Scrutinizer Quality Score](https://img.shields.io/scrutinizer/g/orchestral/messages/master.svg?style=flat)](https://scrutinizer-ci.com/g/orchestral/messages/)
[![Build Status](https://img.shields.io/travis/orchestral/messages/3.1.svg?style=flat)](https://travis-ci.org/orchestral/messages)
[![Coverage Status](https://img.shields.io/coveralls/orchestral/messages/3.1.svg?style=flat)](https://coveralls.io/r/orchestral/messages?branch=3.1)
[![Scrutinizer Quality Score](https://img.shields.io/scrutinizer/g/orchestral/messages/3.1.svg?style=flat)](https://scrutinizer-ci.com/g/orchestral/messages/)

## Table of Content

Expand All @@ -19,15 +19,15 @@ Messages Component bring a unified notification support for Laravel and Orchestr
- [Adding a Message](#adding-a-message)
- [Extending a Message to Current Request](#extending-a-message-to-current-request)
- [Displaying the Message in a View](#displaying-the-message-in-a-view)
* [Change Log](http://orchestraplatform.com/docs/latest/components/messages/changes#v3-0)
* [Change Log](http://orchestraplatform.com/docs/latest/components/messages/changes#v3-1)

## Version Compatibility

Laravel | Messages
:----------|:----------
4.2.x | 2.2.x
5.0.x | 3.0.x
5.1.x | 3.1.x@dev
5.1.x | 3.1.x

## Installation

Expand All @@ -36,7 +36,7 @@ To install through composer, simply put the following in your `composer.json` fi
```json
{
"require": {
"orchestra/messages": "3.1.*"
"orchestra/messages": "~3.0"
}
}
```
Expand All @@ -47,7 +47,7 @@ And then run `composer install` from the terminal.

Above installation can also be simplify by using the following command:

composer require "orchestra/messages=3.1.*"
composer require "orchestra/messages=~3.0"


## Configuration
Expand Down
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@
"illuminate/support": "5.1.*"
},
"suggest": {
"laravel/framework": "Allow using orchestra/support component outside of Orchestra Platform",
"orchestra/foundation": "Allow using orchestra/support with Orchestra Platform"
"laravel/framework": "Allow using orchestra/support component outside of Orchestra Platform (~5.1).",
"orchestra/foundation": "Allow using orchestra/support with Orchestra Platform (~3.1)."
},
"extra": {
"branch-alias": {
"dev-master": "3.1-dev"
"dev-master": "3.2-dev"
}
},
"minimum-stability": "dev"
Expand Down

0 comments on commit b74cc65

Please sign in to comment.