about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2018-10-31 01:04:45 +0100
committerGitHub <noreply@github.com>2018-10-31 01:04:45 +0100
commitba06a5f485d305bc917506828fd5cb20b3f0c226 (patch)
treee4fe97b7383638274a21cf8a0c526384547ff825
parentb9d0d209cd16ef19b306528a9c4be34b47cf1945 (diff)
Bump version to 2.6.1 (#9172)
-rw-r--r--CHANGELOG.md6
-rw-r--r--lib/mastodon/version.rb2
2 files changed, 7 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6a7502656..cb8bf3272 100644
--- 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 7cc837345..2e39ad01e 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -13,7 +13,7 @@ module Mastodon
     end
 
     def patch
-      0
+      1
     end
 
     def pre