Updated laravel

This commit is contained in:
Graham Campbell
2016-06-11 00:21:03 +01:00
parent c0d3602a91
commit cd4a96983e
2 changed files with 8 additions and 8 deletions

View File

@@ -20,7 +20,7 @@
],
"require": {
"php": ">=5.5.9",
"laravel/framework": "5.2.36",
"laravel/framework": "5.2.37",
"alt-three/badger": "^3.1",
"alt-three/bus": "^1.1",
"alt-three/emoji": "^3.1",

14
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": "3cf8779e6eade7a977ee746ee4009369",
"content-hash": "d336ee6a896ce28d8e174bedb9bc96f3",
"hash": "2ee6a1b922093854e9fb3f8e0ffecdd6",
"content-hash": "0af469d18c15843f38c76b9330c299aa",
"packages": [
{
"name": "alt-three/badger",
@@ -1939,16 +1939,16 @@
},
{
"name": "laravel/framework",
"version": "v5.2.36",
"version": "v5.2.37",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
"reference": "236d7c0c5b67a2348ac7831391031d93000de3ab"
"reference": "bf199036b0e222a27e2133d841aee0d4238f804d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/236d7c0c5b67a2348ac7831391031d93000de3ab",
"reference": "236d7c0c5b67a2348ac7831391031d93000de3ab",
"url": "https://api.github.com/repos/laravel/framework/zipball/bf199036b0e222a27e2133d841aee0d4238f804d",
"reference": "bf199036b0e222a27e2133d841aee0d4238f804d",
"shasum": ""
},
"require": {
@@ -2064,7 +2064,7 @@
"framework",
"laravel"
],
"time": "2016-06-06 15:18:48"
"time": "2016-06-10 22:38:47"
},
{
"name": "league/commonmark",