v1.13.1

Conflicts: CHANGELOG.rdoc
CanCanCommunity · Oct 8, 2015 · 507e1c1 · 507e1c1
1 parent 79dcac8
commit 507e1c1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc
@@ -4,6 +4,10 @@ Unreleased
 
 * Add support for rails 4 enum's (markpmitchell)
 
+1.13.1 (Oct 8th, 2015)
+
+* Fix #merge with empty Ability (jhawthorn)
+
 1.13.0 (Oct 7th, 2015)
 
 * Significantly improve rule lookup time (amarshall)

diff --git a/lib/cancan/version.rb b/lib/cancan/version.rb
@@ -1,3 +1,3 @@
 module CanCan
-  VERSION = "1.13.0"
+  VERSION = "1.13.1"
 end