From 813bab91a213d2a894a7fbe398ecc2cb042a9264 Mon Sep 17 00:00:00 2001
From: William DURAND <william.durand1@gmail.com>
Date: Wed, 9 Apr 2014 16:13:31 +0200
Subject: [PATCH] Prepare 2.6.0 release

---
 CHANGELOG.md     | 7 +++++--
 bin/capifony     | 2 +-
 capifony.gemspec | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cccc4cd..584899d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,9 @@
-### 2.5.1 / ???
+### 2.6.0 / April 9, 2014
 
-n/a
+* Added: `no_release` for symfony1 `publish_assets`
+* Added: allow to skip or not interactive_mode for the task `capifony:doctrine:load:fixtures`
+* Added: support composer version specify (install/self-update)
+* Removed: unneeded dump of autoload files
 
 ### 2.5.0 / February 11, 2014
 
diff --git a/bin/capifony b/bin/capifony
index 263c709..ace64aa 100755
--- a/bin/capifony
+++ b/bin/capifony
@@ -5,7 +5,7 @@ require 'fileutils'
 
 symfony_version  = nil
 symfony_app_path = 'app'
-capifony_version = '2.5.1.dev'
+capifony_version = '2.6.0'
 
 OptionParser.new do |opts|
   opts.banner = "Usage: #{File.basename($0)} [path]"
diff --git a/capifony.gemspec b/capifony.gemspec
index 5596084..4c1b02e 100644
--- a/capifony.gemspec
+++ b/capifony.gemspec
@@ -1,7 +1,7 @@
 Gem::Specification.new do |spec|
 
   spec.name         = 'capifony'
-  spec.version      = '2.5.1.dev'
+  spec.version      = '2.6.0'
   spec.platform     = Gem::Platform::RUBY
   spec.description  = <<-DESC
     Capistrano is an open source tool for running scripts on multiple servers. It’s primary use is for easily deploying applications. While it was built specifically for deploying Rails apps, it’s pretty simple to customize it to deploy other types of applications. This package is a deployment "recipe" to work with symfony (both 1 and 2) applications.