From 2ef8b8411f925e1d5ef7e7c60169b0785a37a285 Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Fri, 14 Aug 2015 23:20:54 +0100 Subject: [PATCH 1/2] Bumped min versions --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 88561172..ad6aa7cd 100644 --- a/composer.json +++ b/composer.json @@ -20,8 +20,8 @@ ], "require": { "php": "^5.5.9", - "laravel/framework": "~5.1.6", - "alt-three/emoji": "^1.1", + "laravel/framework": "~5.1.10", + "alt-three/emoji": "^1.2", "barryvdh/laravel-cors": "^0.5", "doctrine/dbal": "^2.5", "fideloper/proxy": "^3.0", From b1600bdbee856891d5d82fef63004143d05751a9 Mon Sep 17 00:00:00 2001 From: James Brooks Date: Fri, 14 Aug 2015 23:25:25 +0100 Subject: [PATCH 2/2] Update dependencies --- composer.lock | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/composer.lock b/composer.lock index 0ab7fa6b..0def87fe 100644 --- a/composer.lock +++ b/composer.lock @@ -4,25 +4,26 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "5f9d14ef22256813bf57d232d1813f98", + "hash": "8ad05f265a7f13a963a021a55b21f451", "packages": [ { "name": "alt-three/emoji", - "version": "v1.1.1", + "version": "v1.2.0", "source": { "type": "git", "url": "https://github.com/AltThree/Emoji.git", - "reference": "f0d2783b4760e4fa2cf176cc356cf523a06d8c57" + "reference": "92f01cb2bce289f199dee31e197660d6f6f572de" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/AltThree/Emoji/zipball/f0d2783b4760e4fa2cf176cc356cf523a06d8c57", - "reference": "f0d2783b4760e4fa2cf176cc356cf523a06d8c57", + "url": "https://api.github.com/repos/AltThree/Emoji/zipball/92f01cb2bce289f199dee31e197660d6f6f572de", + "reference": "92f01cb2bce289f199dee31e197660d6f6f572de", "shasum": "" }, "require": { "graham-campbell/markdown": "~4.0", "guzzlehttp/guzzle": "~5.3|~6.0", + "illuminate/contracts": "5.1.*", "illuminate/support": "5.1.*", "php": ">=5.5.9" }, @@ -33,7 +34,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1-dev" + "dev-master": "1.2-dev" } }, "autoload": { @@ -65,7 +66,7 @@ "emoji", "parser" ], - "time": "2015-08-09 18:14:49" + "time": "2015-08-14 22:18:26" }, { "name": "asm89/stack-cors",