lucas.mathieu/cachet-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #344 from cachethq/deps

Browse Source 
Updated Dependencies
This commit is contained in:
James Brooks
2015-01-10 09:17:29 +00:00
parent 4ba88fa8cf a2050f4851
commit 5762905598
2 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
composer.json
View File

@@ -15,16 +15,16 @@
"laravel/framework": "4.2.*", "laravel/framework": "4.2.*",
"dingo/api": "0.8.*", "dingo/api": "0.8.*",
"doctrine/dbal": "2.5.*", "doctrine/dbal": "2.5.*",
"graham-campbell/binput": "~2.1", "graham-campbell/binput": "2.1.*",
"graham-campbell/markdown": "~2.0", "graham-campbell/markdown": "2.0.*",
"graham-campbell/throttle": "~2.0", "graham-campbell/throttle": "2.0.*",
"guzzlehttp/guzzle": "~5.0", "guzzlehttp/guzzle": "5.1.*",
"roumen/feed": "~2.8", "jenssegers/date": "2.0.*",
"thujohn/rss": "~1.0", "mccool/laravel-auto-presenter": "2.2.*",
"watson/validating": "0.10.*", "pragmarx/google2fa": "0.1.*",
"jenssegers/date": "~2.0", "roumen/feed": "2.8.*",
"mccool/laravel-auto-presenter": "~2.2@dev", "thujohn/rss": "1.0.*",
"pragmarx/google2fa": "~0.1.0" "watson/validating": "0.10.*"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "~4.3", "phpunit/phpunit": "~4.3",

10
composer.lock generated
View File

@@ -4,7 +4,7 @@
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"hash": "54919d71db11cf852620b58cd12a982b", "hash": "17e49b071003f48bf48a5d636ef0991d",
"packages": [ "packages": [
{ {
"name": "classpreloader/classpreloader", "name": "classpreloader/classpreloader",
@@ -1460,7 +1460,7 @@
}, },
{ {
"name": "mccool/laravel-auto-presenter", "name": "mccool/laravel-auto-presenter",
"version": "2.2.x-dev", "version": "2.2.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/ShawnMcCool/laravel-auto-presenter.git", "url": "https://github.com/ShawnMcCool/laravel-auto-presenter.git",
@@ -3137,7 +3137,7 @@
], ],
"authors": [ "authors": [
{ {
"name": "Pádraic Brady", "name": "Padraic Brady",
"email": "padraic.brady@gmail.com", "email": "padraic.brady@gmail.com",
"homepage": "http://blog.astrumfutura.com" "homepage": "http://blog.astrumfutura.com"
}, },
@@ -3903,9 +3903,7 @@
], ],
"aliases": [], "aliases": [],
"minimum-stability": "stable", "minimum-stability": "stable",
"stability-flags": { "stability-flags": [],
"mccool/laravel-auto-presenter": 20
},
"prefer-stable": false, "prefer-stable": false,
"prefer-lowest": false, "prefer-lowest": false,
"platform": { "platform": {