Merge branch 'maki10-patch-1'

realrashid · Jan 24, 2020 · 05b6726 · 05b6726
2 parents 3c8036f + b3854cc
commit 05b6726
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to `sweet-alert` will be documented in this file.
 
+## v3.1.2 - 2020-01-24
+- Upgraded SweetAlert2 to latest version
+- Prepare Laravel 7
+
 ## v3.1.1 - 2020-01-07
 - Upgraded SweetAlert2 to latest version
 - Added ability to activate or not the middleware error messages

diff --git a/composer.json b/composer.json
@@ -30,7 +30,7 @@
     },
     "require": {
         "php": "^7.2",
-        "laravel/framework": "~5.4.0|~5.8.0|~5.9.0|^6.0"
+        "laravel/framework": "^5.4|^6.0|^7.0"
     },
     "require-dev": {
         "symfony/thanks": "^1.0"

diff --git a/docs/changelog.md b/docs/changelog.md
@@ -2,6 +2,10 @@
 
 All notable changes to `sweet-alert` will be documented in this file.
 
+## v3.1.2 - 2020-01-24
+- Upgraded SweetAlert2 to latest version
+- Prepare Laravel 7
+
 ## v3.1.1 - 2020-01-07
 - Upgraded SweetAlert2 to latest version
 - Added ability to activate or not the middleware error messages

diff --git a/resources/js/sweetalert.all.js b/resources/js/sweetalert.all.js