v2.6.0

Exelord · Dec 19, 2018 · d95f8ca · d95f8ca
1 parent 970b0dc
commit d95f8ca
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/.github_changelog_generator b/.github_changelog_generator
@@ -1 +1 @@
-future-release=2.5.0
+future-release=2.6.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,14 @@
 # Change Log
 
-## [2.5.0](https://github.com/Exelord/Monarchy/tree/2.5.0) (2018-03-25)
-[Full Changelog](https://github.com/Exelord/Monarchy/compare/v2.4.0...2.5.0)
+## [2.6.0](https://github.com/Exelord/Monarchy/tree/2.6.0) (2018-12-19)
+[Full Changelog](https://github.com/Exelord/Monarchy/compare/v2.5.0...2.6.0)
+
+**Merged pull requests:**
+
+- Updates [\#82](https://github.com/Exelord/Monarchy/pull/82) ([Exelord](https://github.com/Exelord))
+
+## [v2.5.0](https://github.com/Exelord/Monarchy/tree/v2.5.0) (2018-03-25)
+[Full Changelog](https://github.com/Exelord/Monarchy/compare/v2.4.0...v2.5.0)
 
 **Fixed bugs:**
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    monarchy (2.5.0)
+    monarchy (2.6.0)
       active_record_union (= 1.3.0)
       activerecord (>= 4.2.7.1)
       closure_tree (= 7.0.0)

diff --git a/lib/monarchy/version.rb b/lib/monarchy/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Monarchy
-  VERSION = '2.5.0'
+  VERSION = '2.6.0'
 end