Merge pull request #1120 from Kitware/releases/3.0

Merge release branch back into master
Kitware · Feb 19, 2021 · 12b7373 · 12b7373
2 parents c176167 + c4b24af
commit 12b7373
Show file tree

Hide file tree

Showing 2 changed files with 133 additions and 123 deletions.
diff --git a/composer.json b/composer.json
@@ -27,7 +27,7 @@
     "guzzlehttp/guzzle": "~6.2",
     "iron-io/iron_mq": "~2.0",
     "knplabs/github-api": "dev-master#8c26dc85",
-    "laravel/framework": "6.20.12",
+    "laravel/framework": "6.20.14",
     "lcobucci/jwt": "3.2.0",
     "league/oauth2-github": "^2.0",
     "league/oauth2-google": "^2.0",