Skip to content

Commit

Permalink
Merge pull request #54 from simde-utc/feature/update-composer
Browse files Browse the repository at this point in the history
Mise à jour de composer et correction du plantage des tests
  • Loading branch information
NastuzziSamy authored Feb 2, 2019
2 parents c0cd043 + 5f75d86 commit 0162455
Show file tree
Hide file tree
Showing 3 changed files with 7,506 additions and 5 deletions.
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,16 @@
/.idea
/.vscode
/.vagrant
composer.lock
Homestead.json
Homestead.yaml
npm-debug.log
yarn-error.log
.env
.ftpconfig
package-lock\.json
# Front generated filed
public/js/app\.js
public/css/app\.css
public/css/bootstrap\.css
public/js/index\.js
public/docs/*

public/mix-manifest\.json
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"laravel-admin-ext/chartjs": "^1.0",
"laravel-admin-ext/log-viewer": "^1.0",
"laravel/framework": "5.6.*",
"laravel/passport": "^6.0",
"laravel/passport": "6.*",
"laravel/tinker": "~1.0",
"mews/captcha": "^2.2",
"nastuzzi-samy/api-tester": "^1.1",
Expand All @@ -31,7 +31,7 @@
"fzaninotto/faker": "~1.4",
"mockery/mockery": "~1.0",
"nunomaduro/collision": "~1.1",
"nunomaduro/larastan": "^0.3.8",
"nunomaduro/larastan": "=0.3.13",
"phpunit/phpunit": "~7.0",
"symfony/thanks": "^1.0",
"squizlabs/php_codesniffer": "3.*"
Expand Down
Loading

0 comments on commit 0162455

Please sign in to comment.