Merge branch 'develop' into feature/PTDL-472

This commit is contained in:
Dane Everitt 2017-06-25 15:36:39 -05:00
commit b7b046c044
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
24 changed files with 672 additions and 82 deletions

View file

@ -12,20 +12,20 @@
],
"require": {
"php": ">=7.0.0",
"ext-mbstring": "*",
"ext-pdo_mysql": "*",
"ext-zip": "*",
"aws/aws-sdk-php": "3.26.5",
"barryvdh/laravel-debugbar": "2.3.2",
"aws/aws-sdk-php": "3.29.7",
"barryvdh/laravel-debugbar": "2.4.0",
"daneeveritt/login-notifications": "1.0.0",
"doctrine/dbal": "2.5.12",
"edvinaskrucas/settings": "2.0.0",
"fideloper/proxy": "3.3.0",
"ext-mbstring": "*",
"ext-zip": "*",
"ext-pdo_mysql": "*",
"fideloper/proxy": "3.3.3",
"guzzlehttp/guzzle": "6.2.3",
"igaster/laravel-theme": "1.14.0",
"igaster/laravel-theme": "1.16.0",
"laracasts/utilities": "2.1.0",
"laravel/framework": "5.4.21",
"laravel/tinker": "1.0.0",
"laravel/framework": "5.4.27",
"laravel/tinker": "1.0.1",
"lord/laroute": "2.4.4",
"mtdowling/cron-expression": "1.2.0",
"nesbot/carbon": "1.22.1",
@ -35,7 +35,7 @@
"prologue/alerts": "0.4.1",
"s1lentium/iptools": "1.1.0",
"sofa/eloquence": "5.4.1",
"spatie/laravel-fractal": "4.0.0",
"spatie/laravel-fractal": "4.0.1",
"watson/validating": "3.0.1",
"webpatser/laravel-uuid": "2.0.1"
},