From cbbbdae32f1d65497b9b317247c8480bb8bb59b7 Mon Sep 17 00:00:00 2001
From: Charles <crossan007@gmail.com>
Date: Sat, 18 Feb 2017 20:09:28 -0500
Subject: [PATCH 1/3] fixes #1937

---
 src/mysql/upgrade.json | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/src/mysql/upgrade.json b/src/mysql/upgrade.json
index 508976722d..a55fa6acde 100644
--- a/src/mysql/upgrade.json
+++ b/src/mysql/upgrade.json
@@ -93,25 +93,17 @@
         "scripts": [
             "/mysql/upgrade/2.5.0.sql"
         ],
-        "dbVersion":"2.5.0"
-    },
-    "pre-2.6.0": {
-        "versions": [
-          "2.5.0",
-          "2.5.1",
-          "2.5.2"
-        ],
-        "scripts":[
-          "/mysql/upgrade/2.6.0.sql"
-        ],
-        "dbVersion": "2.6.0"
+        "dbVersion": "2.5.0"
     },
     "current": {
         "versions": [
-          "2.6.0"
+            "2.5.0",
+            "2.5.1",
+            "2.5.2"
         ],
-        "scripts":[
+        "scripts": [
+            "/mysql/upgrade/2.6.0.sql"
         ],
-        "dbVersion": "2.7.0"
+        "dbVersion": "2.6.0"
     }
-}
+}
\ No newline at end of file

From cdcd74d6ea6a43bfc573a7527fdce416ac72032e Mon Sep 17 00:00:00 2001
From: Charles <crossan007@gmail.com>
Date: Sat, 18 Feb 2017 20:13:11 -0500
Subject: [PATCH 2/3] consistent upgrade naming

---
 src/mysql/upgrade.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mysql/upgrade.json b/src/mysql/upgrade.json
index a55fa6acde..f8915809ef 100644
--- a/src/mysql/upgrade.json
+++ b/src/mysql/upgrade.json
@@ -95,7 +95,7 @@
         ],
         "dbVersion": "2.5.0"
     },
-    "current": {
+    "pre-2.6.0": {
         "versions": [
             "2.5.0",
             "2.5.1",

From 4a2375dff17e4d84c6eb15ae3121311b8c51d73a Mon Sep 17 00:00:00 2001
From: Charles <crossan007@gmail.com>
Date: Sat, 18 Feb 2017 20:22:26 -0500
Subject: [PATCH 3/3] fix versions

---
 src/composer.json      | 2 +-
 src/mysql/upgrade.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/composer.json b/src/composer.json
index 3ed3d5fb0b..1eb06fd91c 100644
--- a/src/composer.json
+++ b/src/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "ChurchCRM/CRM",
-    "version": "2.7.0",
+    "version": "2.6.0",
     "type": "project",
     "keywords": [
         "church",
diff --git a/src/mysql/upgrade.json b/src/mysql/upgrade.json
index f8915809ef..a55fa6acde 100644
--- a/src/mysql/upgrade.json
+++ b/src/mysql/upgrade.json
@@ -95,7 +95,7 @@
         ],
         "dbVersion": "2.5.0"
     },
-    "pre-2.6.0": {
+    "current": {
         "versions": [
             "2.5.0",
             "2.5.1",