Bump version to 2.6.1 (mastodon#9172)

hachyderm · Oct 31, 2018 · ba06a5f · ba06a5f
1 parent b9d0d20
commit ba06a5f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,12 @@ Changelog
 
 All notable changes to this project will be documented in this file.
 
+## [2.6.1] - 2018-10-30
+### Fixed
+
+- Fix resolving resources by URL not working due to a regression in #9132 (#9171)
+- Fix reducer error in web UI when a conversation has no last status (#9173)
+
 ## [2.6.0] - 2018-10-30
 ### Added
 

diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
@@ -13,7 +13,7 @@ def minor
     end
 
     def patch
-      0
+      1
     end
 
     def pre
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,7 +13,7 @@ def minor @@
         end
         def patch
         end
         def pre
@@ Expand Down @@