From 8562d1f7f3f8e11c2bc3c1936f1509e22a8433d2 Mon Sep 17 00:00:00 2001
From: DariusIII <dkrisan@gmail.com>
Date: Thu, 20 Jul 2017 11:16:04 +0200
Subject: [PATCH] Update laravel/framework and laravel/tinker to latest
 versions

---
 Changelog                                     |  2 ++
 build/nntmux.xml                              |  2 +-
 composer.lock                                 | 20 +++++++++----------
 resources/db/patches/mysql/+1~dummy_patch.sql |  0
 .../db/patches/mysql/0314~dummy_patch.sql     |  1 -
 5 files changed, 13 insertions(+), 12 deletions(-)
 delete mode 100644 resources/db/patches/mysql/+1~dummy_patch.sql
 delete mode 100644 resources/db/patches/mysql/0314~dummy_patch.sql

diff --git a/Changelog b/Changelog
index 2df470e0d..bcf413dfc 100755
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,5 @@
+2017-07-20 DariusIII
+	* Chg: Update laravel/framework and laravel/tinker to latest versions
 2017-07-19 DariusIII
 	* Chg: Update travis.yml, move before_script to the beginning
 	* Chg: "Laravelize" NNTmux (use laravel in NNTmux)
diff --git a/build/nntmux.xml b/build/nntmux.xml
index 03106a396..4cec7a18b 100755
--- a/build/nntmux.xml
+++ b/build/nntmux.xml
@@ -16,7 +16,7 @@
 			</last>
 		</scripts>
 		<sql>
-			<db>314</db>
+			<db>315</db>
 			<file>314</file>
 		</sql>
 	</versions>
diff --git a/composer.lock b/composer.lock
index da11078d1..445cb043c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -2547,16 +2547,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v5.4.28",
+            "version": "v5.4.30",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "442511fc62121085d184355e4f964c88942bbecb"
+                "reference": "b9a64955f4278f45ac348a6e000b5ecc85da167a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/442511fc62121085d184355e4f964c88942bbecb",
-                "reference": "442511fc62121085d184355e4f964c88942bbecb",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/b9a64955f4278f45ac348a6e000b5ecc85da167a",
+                "reference": "b9a64955f4278f45ac348a6e000b5ecc85da167a",
                 "shasum": ""
             },
             "require": {
@@ -2672,20 +2672,20 @@
                 "framework",
                 "laravel"
             ],
-            "time": "2017-06-30T13:43:07+00:00"
+            "time": "2017-07-19T19:26:19+00:00"
         },
         {
             "name": "laravel/tinker",
-            "version": "v1.0.1",
+            "version": "v1.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/tinker.git",
-                "reference": "7eb2e281395131897407285672ef5532e87e17f9"
+                "reference": "203978fd67f118902acff95925847e70b72e3daf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/tinker/zipball/7eb2e281395131897407285672ef5532e87e17f9",
-                "reference": "7eb2e281395131897407285672ef5532e87e17f9",
+                "url": "https://api.github.com/repos/laravel/tinker/zipball/203978fd67f118902acff95925847e70b72e3daf",
+                "reference": "203978fd67f118902acff95925847e70b72e3daf",
                 "shasum": ""
             },
             "require": {
@@ -2735,7 +2735,7 @@
                 "laravel",
                 "psysh"
             ],
-            "time": "2017-06-01T16:31:26+00:00"
+            "time": "2017-07-13T13:11:05+00:00"
         },
         {
             "name": "league/flysystem",
diff --git a/resources/db/patches/mysql/+1~dummy_patch.sql b/resources/db/patches/mysql/+1~dummy_patch.sql
deleted file mode 100644
index e69de29bb..000000000
diff --git a/resources/db/patches/mysql/0314~dummy_patch.sql b/resources/db/patches/mysql/0314~dummy_patch.sql
deleted file mode 100644
index 7fd55ed0a..000000000
--- a/resources/db/patches/mysql/0314~dummy_patch.sql
+++ /dev/null
@@ -1 +0,0 @@
-UPDATE settings SET  value = value - 1 where setting = 'sqlpatch';
\ No newline at end of file