diff --git a/composer.json b/composer.json index 8cdd573d..6e9ed886 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ ], "type": "project", "require": { - "laravel/framework": "~5.0.20", + "laravel/framework": "~5.0.23", "laravelcollective/html": "~5.0", "barryvdh/laravel-debugbar": "~2.0", "cartalyst/sentry": "dev-feature/laravel-5", @@ -26,7 +26,7 @@ "maatwebsite/laravel-sidebar": "~1.0.0", "typicms/nestablecollection": "~1.1.0", "typicms/translatablebootforms": "~2.0.2", - "typicms/core": "~2.0.20", + "typicms/core": "~2.0.21", "typicms/blocks": "~2.0.6", "typicms/dashboard": "~2.0.4", "typicms/files": "~2.0.6", @@ -42,7 +42,7 @@ "typicms/users": "~2.0.4" }, "require-dev": { - "phpunit/phpunit": "~4.0", + "phpunit/phpunit": "~4.5", "phpspec/phpspec": "~2.1" }, "autoload": { diff --git a/composer.lock b/composer.lock index aa354c40..d33aa757 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "91be4ec0658fb1611cceed965c98f1a2", + "hash": "397611205bb13dc5b9a4f32f5074025f", "packages": [ { "name": "adamwathan/bootforms", @@ -2916,16 +2916,16 @@ }, { "name": "typicms/core", - "version": "v2.0.20", + "version": "v2.0.21", "source": { "type": "git", "url": "https://github.com/TypiCMS/Core.git", - "reference": "7936ede31a075992cb5422a6f689d5ad9890a1b2" + "reference": "557f0259e2b43b5408b079db3250f6b992dec8b3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/TypiCMS/Core/zipball/7936ede31a075992cb5422a6f689d5ad9890a1b2", - "reference": "7936ede31a075992cb5422a6f689d5ad9890a1b2", + "url": "https://api.github.com/repos/TypiCMS/Core/zipball/557f0259e2b43b5408b079db3250f6b992dec8b3", + "reference": "557f0259e2b43b5408b079db3250f6b992dec8b3", "shasum": "" }, "require": { @@ -2948,7 +2948,7 @@ "email": "sdebacker@gmail.com" } ], - "time": "2015-03-27 22:00:56" + "time": "2015-03-31 08:47:53" }, { "name": "typicms/dashboard",