From ba06a5f485d305bc917506828fd5cb20b3f0c226 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Wed, 31 Oct 2018 01:04:45 +0100 Subject: [PATCH] Bump version to 2.6.1 (#9172) --- CHANGELOG.md | 6 ++++++ lib/mastodon/version.rb | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6a75026563..cb8bf3272b 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 7cc837345e..2e39ad01ed 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