From 0412591db0577ccbe125e2624bd49f76f975f3da Mon Sep 17 00:00:00 2001 From: Gravitano Date: Wed, 3 Jun 2015 12:08:14 +0700 Subject: [PATCH] Squashed 'src/Pingpong/Shortcode/' changes from 139ee0b..745f064 745f064 Update header 148afda Merge branch 2.0 136e721 set minimum stability to dev f3e3c43 Added support for Laravel 5.1 (develop version). Ref: pingpong-labs/modules#151 REVERT: 139ee0b update title git-subtree-dir: src/Pingpong/Shortcode git-subtree-split: 745f0647a7bdc4aa19b9b96d63f29a6e67647878 --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 5b952f34..fee690d6 100644 --- a/composer.json +++ b/composer.json @@ -16,8 +16,8 @@ ], "require": { "php": ">=5.4.0", - "illuminate/container": "5.0.*", - "illuminate/support": "5.0.*" + "illuminate/container": "5.1.*@dev", + "illuminate/support": "5.1.*@dev" }, "require-dev": { "phpunit/phpunit": "~4", @@ -28,5 +28,5 @@ "Pingpong\\Shortcode\\": "" } }, - "minimum-stability": "stable" + "minimum-stability": "dev" }