Skip to content

Commit 416768e

Browse files
author
Mikk Mihkel Nurges
committed
Merge branch 'master' into develop
2 parents 0b86fb6 + e65e17d commit 416768e

File tree

9 files changed

+1245
-876
lines changed

9 files changed

+1245
-876
lines changed

Readme.md

Lines changed: 322 additions & 336 deletions
Large diffs are not rendered by default.

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@
2929
"type": "project",
3030
"require": {
3131
"php": ">=5.5.9",
32-
"illuminate/support": "5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*",
32+
"illuminate/support": "5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*",
3333
"webonyx/graphql-php": "~0.10.0",
34-
"laravel/framework": "5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*"
34+
"laravel/framework": "5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*"
3535
},
3636
"require-dev": {
3737
"orchestra/testbench": "3.1.*|3.2.*|3.3.*|3.4.*|3.5.*",
38-
"phpunit/phpunit": "^5.5|~6.0"
38+
"phpunit/phpunit": "^5.5|~6.0|~7.0"
3939
},
4040
"autoload": {
4141
"psr-0": {

composer.lock

Lines changed: 625 additions & 308 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)