Merge branch 'master' into 5.2

santigarcor · Mar 9, 2020 · c709f44 · c709f44
2 parents f9ff044 + aacaa8f
commit c709f44
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -12,7 +12,7 @@
     "require": {
         "php": "^7.1",
         "kkszymanowski/traitor": "^0.2.0",
-        "laravel/framework": "~5.6.0|~5.7.0|~5.8.0|~6.0"
+        "laravel/framework": "~5.6.0|~5.7.0|~5.8.0|~6.0|~7.0"
     },
     "require-dev": {
         "mockery/mockery": ">=0.9.9",

diff --git a/yarn.lock b/yarn.lock
@@ -4373,9 +4373,9 @@ mississippi@^2.0.0:
     through2 "^2.0.0"
 
 mixin-deep@^1.2.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe"
-  integrity sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566"
+  integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==
   dependencies:
     for-in "^1.0.2"
     is-extendable "^1.0.1"