Remerge mit Development
... | @@ -6,13 +6,14 @@ | ... | @@ -6,13 +6,14 @@ |
"type": "project", | "type": "project", | ||
"require": { | "require": { | ||
"php": ">=5.6.4", | "php": ">=5.6.4", | ||
"fideloper/proxy": "^3.1", | |||
"guzzlehttp/guzzle": "^6.2", | |||
"jenssegers/agent": "^2.3", | |||
"laravel/framework": "5.5.*", | "laravel/framework": "5.5.*", | ||
"predis/predis": "^1.1", | "laravelcollective/html": "^5.2.0", | ||
"mcamara/laravel-localization": "^1.1", | "mcamara/laravel-localization": "^1.1", | ||
"jenssegers/agent": "^2.3", | |||
"piwik/piwik-php-tracker": "^1.0", | "piwik/piwik-php-tracker": "^1.0", | ||
"fideloper/proxy": "^3.1", | "predis/predis": "^1.1" | ||
"guzzlehttp/guzzle": "^6.2" | |||
}, | }, | ||
"require-dev": { | "require-dev": { | ||
"fzaninotto/faker": "~1.4", | "fzaninotto/faker": "~1.4", | ||
... | ... |
File added
File added
This source diff could not be displayed because it is too large. You can view the blob instead.
File added
File added
File added