Skip to content

Commit

Permalink
Merge branch '3.3'
Browse files Browse the repository at this point in the history
Signed-off-by: crynobone <crynobone@gmail.com>
  • Loading branch information
crynobone committed Jan 26, 2017
2 parents 9f9cb09 + b83d98b commit 2e6c62c
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ sudo: false
php:
- 5.6
- 7.0
- hhvm
- 7.1

env:
global:
Expand Down
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
Messages Component for Laravel and Orchestra Platform
==============

[![Join the chat at https://gitter.im/orchestral/platform/components](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/orchestral/platform/components?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

Messages Component bring a unified notification support for Laravel and Orchestra Platform.

[![Latest Stable Version](https://img.shields.io/github/release/orchestral/messages.svg?style=flat-square)](https://packagist.org/packages/orchestra/messages)
Expand Down
11 changes: 5 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,18 @@
"orchestra/support": "~3.4.0"
},
"require-dev": {
"mockery/mockery": "^0.9.4",
"illuminate/container": "~5.4.0",
"illuminate/http": "~5.4.0",
"illuminate/session": "~5.4.0"
},
"suggest": {
"laravel/framework": "Allow using orchestra/messages component outside of Orchestra Platform (~5.4).",
"orchestra/foundation": "Allow using orchestra/messages with Orchestra Platform (~3.4)."
"illuminate/session": "~5.4.0",
"mockery/mockery": "^0.9.4"
},
"extra": {
"branch-alias": {
"dev-master": "3.4-dev"
}
},
"config": {
"sort-packages": true
},
"minimum-stability": "dev"
}

0 comments on commit 2e6c62c

Please sign in to comment.