From a3170356ab773cb4d905071a231572a934bb3214 Mon Sep 17 00:00:00 2001
From: John Hawthorn <john@hawthorn.email>
Date: Wed, 16 May 2018 14:33:21 -0700
Subject: [PATCH 1/2] Update CHANGELOG for 2.6.0 release

---
 CHANGELOG.md | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 281c75dab28..48fdb606277 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,18 @@
-## Solidus 2.6.0 (master, unreleased)
+## Solidus 2.6.0 (2018-05-16)
+
+### Major changes
+
+**Rails 5.2**
+
+This is the first version of Solidus to support [Rails 5.2](http://guides.rubyonrails.org/5_2_release_notes.html). Solidus 2.6.0 supports either Rails 5.1 or 5.2. We're hoping this makes both upgrades as easy as possible since they can be done separately.
+
+**Merged solidus_i18n functionality**
+
+Much of solidus_i18n's functionality has been merged into Solidus itself. Solidus now allows configuring one or more locales per-store in the admin. Both users and admins can select their preferred locales on the frontend or admin respectively. More information on how to upgrade can be found in the [solidus_i18n README](https://github.com/solidusio/solidus_i18n).
+
+**Guides**
+
+A lot of work has gone into guides, which are now much more comprehensive. A website to host them is in the works but for now they can be seen [on github](https://github.com/solidusio/solidus/blob/v2.6/guides/index.md)
 
 ### Core
 - Upgrade cancancan to 2.x [#2731](https://github.com/solidusio/solidus/pull/2731) ([jhawthorn](https://github.com/jhawthorn))

From df0c70b347ac2ce1530219f4dee64da487546aaa Mon Sep 17 00:00:00 2001
From: John Hawthorn <john@hawthorn.email>
Date: Wed, 16 May 2018 14:34:01 -0700
Subject: [PATCH 2/2] Master now tracks 2.7.0

---
 CHANGELOG.md                   | 2 ++
 core/lib/spree/core/version.rb | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 48fdb606277..e03d241350f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,5 @@
+## Solidus 2.7.0 (master, unreleased)
+
 ## Solidus 2.6.0 (2018-05-16)
 
 ### Major changes
diff --git a/core/lib/spree/core/version.rb b/core/lib/spree/core/version.rb
index 65e04f64499..a35b9c36c9a 100644
--- a/core/lib/spree/core/version.rb
+++ b/core/lib/spree/core/version.rb
@@ -2,7 +2,7 @@
 
 module Spree
   def self.solidus_version
-    "2.6.0.alpha"
+    "2.7.0.alpha"
   end
 
   def self.solidus_gem_version