From 5bcc761a537edb28926a6dd7ba67a6fe24a81554 Mon Sep 17 00:00:00 2001
From: DariusIII <dkrisan@gmail.com>
Date: Sat, 1 Jul 2017 20:45:42 +0200
Subject: [PATCH] Merge PR #152 by Nightah - Release Naming Regexes

---
 Changelog                                                     | 2 ++
 build/nntmux.xml                                              | 4 ++--
 ...ase_naming_regexes.sql => 0314~release_naming_regexes.sql} | 0
 3 files changed, 4 insertions(+), 2 deletions(-)
 rename resources/db/patches/mysql/{+1~release_naming_regexes.sql => 0314~release_naming_regexes.sql} (100%)

diff --git a/Changelog b/Changelog
index e0468c46e..4c6d2de9c 100755
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,5 @@
+2017-07-01 DariusIII
+	* Mrg: Merge PR #152 by Nightah - Release Naming Regexes
 2017-06-28 DariusIII
 	* Mrg: Merge PR #151 by Nightah - Fix safe_backfill
 2017-06-27 DariusIII
diff --git a/build/nntmux.xml b/build/nntmux.xml
index bfc96be63..03106a396 100755
--- a/build/nntmux.xml
+++ b/build/nntmux.xml
@@ -16,8 +16,8 @@
 			</last>
 		</scripts>
 		<sql>
-			<db>313</db>
-			<file>313</file>
+			<db>314</db>
+			<file>314</file>
 		</sql>
 	</versions>
 </nntmux>
diff --git a/resources/db/patches/mysql/+1~release_naming_regexes.sql b/resources/db/patches/mysql/0314~release_naming_regexes.sql
similarity index 100%
rename from resources/db/patches/mysql/+1~release_naming_regexes.sql
rename to resources/db/patches/mysql/0314~release_naming_regexes.sql