From 423a493e63db128960300fdf1117d8f2babd2f8c Mon Sep 17 00:00:00 2001
From: Pavel Pravosud <pavel@pravosud.com>
Date: Sun, 17 May 2015 14:31:26 -0700
Subject: [PATCH] Version 2.2.14

---
 CHANGELOG.md     | 5 +++++
 jbuilder.gemspec | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a33d28e..2e4b93c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+2.2.14
+------
+
+* [Make Jbuilder compatible with Rails API](https://github.com/rails/jbuilder/commit/29c0014a9c954c990075d42c45c66075260e924b)
+
 2.2.13
 ------
 
diff --git a/jbuilder.gemspec b/jbuilder.gemspec
index 4720890..449c2bf 100644
--- a/jbuilder.gemspec
+++ b/jbuilder.gemspec
@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name     = 'jbuilder'
-  s.version  = '2.2.13'
+  s.version  = '2.2.14'
   s.authors  = ['David Heinemeier Hansson', 'Pavel Pravosud']
   s.email    = ['david@37signals.com', 'pavel@pravosud.com']
   s.summary  = 'Create JSON structures via a Builder-style DSL'