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

Merge pull request #1664 from CachetHQ/updates

Browse Source 
Updated dependencies
This commit is contained in:
Graham Campbell
2016-03-26 18:02:14 +00:00
parent 84aea0e869 841e102971
commit b556eac851
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
composer.json
+5 -5
View File
@@ -20,7 +20,7 @@
], ],
"require": { "require": {
"php": ">=5.5.9", "php": ">=5.5.9",
"laravel/framework": "~5.2.24", "laravel/framework": "~5.2.26",
"alt-three/badger": "^3.0", "alt-three/badger": "^3.0",
"alt-three/bus": "^1.0", "alt-three/bus": "^1.0",
"alt-three/emoji": "^3.0", "alt-three/emoji": "^3.0",
@@ -32,11 +32,11 @@
"graham-campbell/core": "^4.2", "graham-campbell/core": "^4.2",
"graham-campbell/markdown": "^6.0", "graham-campbell/markdown": "^6.0",
"graham-campbell/exceptions": "^8.3", "graham-campbell/exceptions": "^8.3",
"guzzlehttp/guzzle": "^6.1", "guzzlehttp/guzzle": "^6.2",
"jenssegers/date": "^3.1", "jenssegers/date": "^3.1",
"mccool/laravel-auto-presenter": "^4.2", "mccool/laravel-auto-presenter": "^4.2",
"pragmarx/google2fa": "^0.7.1", "pragmarx/google2fa": "^0.7.1",
"rcrowe/twigbridge": "^0.9.1", "rcrowe/twigbridge": "^0.9.2",
"roumen/feed": "^2.10" "roumen/feed": "^2.10"
}, },
"require-dev": { "require-dev": {
@@ -74,13 +74,13 @@
"php artisan key:generate" "php artisan key:generate"
], ],
"post-install-cmd": [ "post-install-cmd": [
"php artisan clear-compiled", "Illuminate\\Foundation\\ComposerScripts::postInstall",
"php artisan optimize --force", "php artisan optimize --force",
"php artisan config:cache", "php artisan config:cache",
"php artisan route:cache" "php artisan route:cache"
], ],
"post-update-cmd": [ "post-update-cmd": [
"php artisan clear-compiled", "Illuminate\\Foundation\\ComposerScripts::postUpdate",
"php artisan optimize --force", "php artisan optimize --force",
"php artisan config:cache", "php artisan config:cache",
"php artisan route:cache" "php artisan route:cache"
composer.lock
Generated
+7 -7
View File
@@ -4,8 +4,8 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"hash": "4eb117df631024aa9dc6b1036dc6421d", "hash": "eecd7b14139ec52c478d6b36497570fb",
"content-hash": "714d9d3df78aef789a7fe3780e401885", "content-hash": "d40623b812ddc6c708e56438457d2adb",
"packages": [ "packages": [
{ {
"name": "alt-three/badger", "name": "alt-three/badger",
@@ -1703,16 +1703,16 @@
}, },
{ {
"name": "laravel/framework", "name": "laravel/framework",
"version": "v5.2.24", "version": "v5.2.26",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/laravel/framework.git", "url": "https://github.com/laravel/framework.git",
"reference": "396297a5fd3c70c2fc1af68f09ee574a2380175c" "reference": "b73ac62506c5c2bd49d87fcb1089f7759431e173"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/396297a5fd3c70c2fc1af68f09ee574a2380175c", "url": "https://api.github.com/repos/laravel/framework/zipball/b73ac62506c5c2bd49d87fcb1089f7759431e173",
"reference": "396297a5fd3c70c2fc1af68f09ee574a2380175c", "reference": "b73ac62506c5c2bd49d87fcb1089f7759431e173",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -1827,7 +1827,7 @@
"framework", "framework",
"laravel" "laravel"
], ],
"time": "2016-03-22 13:45:19" "time": "2016-03-25 17:12:52"
}, },
{ {
"name": "league/commonmark", "name": "league/commonmark",