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

Merge pull request #1316 from CachetHQ/update

Browse Source 
Updated dependencies
This commit is contained in:
Graham Campbell
2015-12-30 14:49:06 +00:00
parent cbdfcaad0d 05e8e49035
commit a9217379ec
2 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@@ -20,7 +20,7 @@
],
"require": {
"php": ">=5.5.9",
"laravel/framework": "~5.2.5",
"laravel/framework": "~5.2.6",
"alt-three/bus": "^1.0",
"alt-three/emoji": "^2.1",
"alt-three/validator": "^1.4",

54
composer.lock generated
View File

@@ -4,8 +4,8 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
"hash": "281a3b44abf445c20f354cd7dc84fb48",
"content-hash": "171f0360086d43c1b78d27364e26d6d7",
"hash": "8baadd34f40ad2d4fefb9c25642d2fea",
"content-hash": "202031911699f705b2c05111f89c81b7",
"packages": [
{
"name": "alt-three/bus",
@@ -1739,16 +1739,16 @@
},
{
"name": "laravel/framework",
"version": "v5.2.5",
"version": "5.2.x-dev",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
"reference": "1d165631b90d104c517d54455a5e867584645473"
"reference": "c4d609c75ae88813b624644911984d5bdf6200fb"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/1d165631b90d104c517d54455a5e867584645473",
"reference": "1d165631b90d104c517d54455a5e867584645473",
"url": "https://api.github.com/repos/laravel/framework/zipball/c4d609c75ae88813b624644911984d5bdf6200fb",
"reference": "c4d609c75ae88813b624644911984d5bdf6200fb",
"shasum": ""
},
"require": {
@@ -1775,7 +1775,7 @@
"symfony/routing": "2.8.*|3.0.*",
"symfony/translation": "2.8.*|3.0.*",
"symfony/var-dumper": "2.8.*|3.0.*",
"vlucas/phpdotenv": "~2.0"
"vlucas/phpdotenv": "~2.2"
},
"replace": {
"illuminate/auth": "self.version",
@@ -1809,7 +1809,6 @@
},
"require-dev": {
"aws/aws-sdk-php": "~3.0",
"iron-io/iron_mq": "~2.0",
"mockery/mockery": "~0.9.2",
"pda/pheanstalk": "~3.0",
"phpunit/phpunit": "~4.1",
@@ -1864,7 +1863,7 @@
"framework",
"laravel"
],
"time": "2015-12-24 15:39:57"
"time": "2015-12-30 14:19:10"
},
{
"name": "league/commonmark",
@@ -2624,20 +2623,21 @@
},
{
"name": "roumen/feed",
"version": "v2.9.8",
"version": "v2.9.9",
"source": {
"type": "git",
"url": "https://github.com/RoumenDamianoff/laravel-feed.git",
"reference": "dce91e2d7a912b7b4d6448cc3e7faef725b4c752"
"reference": "f923473cfd7df2af73b1026c8f23a6f873f84027"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/RoumenDamianoff/laravel-feed/zipball/dce91e2d7a912b7b4d6448cc3e7faef725b4c752",
"reference": "dce91e2d7a912b7b4d6448cc3e7faef725b4c752",
"url": "https://api.github.com/repos/RoumenDamianoff/laravel-feed/zipball/f923473cfd7df2af73b1026c8f23a6f873f84027",
"reference": "f923473cfd7df2af73b1026c8f23a6f873f84027",
"shasum": ""
},
"require": {
"illuminate/support": "~5",
"paragonie/random_compat": "~1",
"php": ">=5.5.9"
},
"require-dev": {
@@ -2671,7 +2671,7 @@
"laravel",
"rss"
],
"time": "2015-12-11 18:20:14"
"time": "2015-12-27 15:38:43"
},
{
"name": "simplesoftwareio/simple-qrcode",
@@ -3617,28 +3617,28 @@
},
{
"name": "vlucas/phpdotenv",
"version": "v2.1.0",
"version": "v2.2.0",
"source": {
"type": "git",
"url": "https://github.com/vlucas/phpdotenv.git",
"reference": "c10040e0df17d2ee88e9212b50cbe9319e878f59"
"reference": "9caf304153dc2288e4970caec6f1f3b3bc205412"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/c10040e0df17d2ee88e9212b50cbe9319e878f59",
"reference": "c10040e0df17d2ee88e9212b50cbe9319e878f59",
"url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/9caf304153dc2288e4970caec6f1f3b3bc205412",
"reference": "9caf304153dc2288e4970caec6f1f3b3bc205412",
"shasum": ""
},
"require": {
"php": ">=5.3.9"
},
"require-dev": {
"phpunit/phpunit": "~4.0"
"phpunit/phpunit": "^4.8|^5.0"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.1-dev"
"dev-master": "2.2-dev"
}
},
"autoload": {
@@ -3664,22 +3664,22 @@
"env",
"environment"
],
"time": "2015-10-28 18:53:35"
"time": "2015-12-29 15:10:30"
}
],
"packages-dev": [
{
"name": "alt-three/testbench",
"version": "v1.1.0",
"version": "v1.2.0",
"source": {
"type": "git",
"url": "https://github.com/AltThree/TestBench.git",
"reference": "1fc2d7a725d2d85adc6a2dfba8975c37f701cb04"
"reference": "52a8658201d497a687b2ffb847b27502fa1c3085"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/AltThree/TestBench/zipball/1fc2d7a725d2d85adc6a2dfba8975c37f701cb04",
"reference": "1fc2d7a725d2d85adc6a2dfba8975c37f701cb04",
"url": "https://api.github.com/repos/AltThree/TestBench/zipball/52a8658201d497a687b2ffb847b27502fa1c3085",
"reference": "52a8658201d497a687b2ffb847b27502fa1c3085",
"shasum": ""
},
"require": {
@@ -3695,7 +3695,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.1-dev"
"dev-master": "1.2-dev"
}
},
"autoload": {
@@ -3727,7 +3727,7 @@
"TestBench",
"app"
],
"time": "2015-12-07 21:57:27"
"time": "2015-12-30 00:45:16"
},
{
"name": "doctrine/instantiator",