Bump version to 2.6.1 (#9172)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6a75026563126a6ddf8c5b2cbea612c43f5e33e2..cb8bf3272be4e20fb6bcff79a36aa63f3c95b7de 100644 (file)
--- 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
index 7cc837345e6d7d6f0a4a052bc2eca1f3450522ba..2e39ad01ed5191ab77dcf0f6fe510df3aae4293b 100644 (file)
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -13,7 +13,7 @@ module Mastodon
     end
 
     def patch
-      0
+      1
     end
 
     def pre