mirror_php/Cachet
1
0
Fork 0
mirror of https://github.com/CachetHQ/Cachet.git synced 2025-01-17 13:38:20 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '1.2'

Browse Source 
Conflicts:
	composer.lock
This commit is contained in:
Graham Campbell 2015-09-04 15:09:01 +01:00
commit 4f05f910e9
2 changed files with 7 additions and 7 deletions
Show Stats 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.1.12",
"laravel/framework": "~5.1.16",
"alt-three/emoji": "^1.2",
"alt-three/validator": "^1.2",
"barryvdh/laravel-cors": "^0.5",

12
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
"hash": "05f03078291036582d00ac77cb0c77e2",
"hash": "635e95ea6eb2fbd64b78102d26f9d4e9",
"packages": [
{
"name": "alt-three/emoji",
@ -1682,16 +1682,16 @@
},
{
"name": "laravel/framework",
"version": "v5.1.12",
"version": "v5.1.16",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
"reference": "76a9816f37a58383f6ba093ccf08f253e5488555"
"reference": "e34dcc0c57e0f560248aec5128161256ff8bf4e1"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/76a9816f37a58383f6ba093ccf08f253e5488555",
"reference": "76a9816f37a58383f6ba093ccf08f253e5488555",
"url": "https://api.github.com/repos/laravel/framework/zipball/e34dcc0c57e0f560248aec5128161256ff8bf4e1",
"reference": "e34dcc0c57e0f560248aec5128161256ff8bf4e1",
"shasum": ""
},
"require": {
@ -1806,7 +1806,7 @@
"framework",
"laravel"
],
"time": "2015-08-30 23:25:48"
"time": "2015-09-04 12:46:14"
},
{
"name": "league/commonmark",