Merge pull request solidusio#2575 from jhawthorn/master_2_6

Master now tracks 2.6.0.alpha
jhawthorn · Feb 14, 2018 · 2924904 · 2924904
2 parents 0422e03 + 5ece654
commit 2924904
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,6 @@
-## Solidus 2.5.0 (master, unreleased)
+## Solidus 2.6.0 (master, unreleased)
+
+## Solidus 2.5.0 (unreleased)
 
 ## Major Changes
 ### Migrate to discard from paranoia

diff --git a/core/lib/spree/core/version.rb b/core/lib/spree/core/version.rb
@@ -1,6 +1,6 @@
 module Spree
   def self.solidus_version
-    "2.5.0.alpha"
+    "2.6.0.alpha"
   end
 
   def self.solidus_gem_version