Bump version to 2.6.1 (#9172)

2018-10-31 01:04:45 +01:00 · 2018-10-31 01:04:45 +01:00 · ba06a5f485
commit ba06a5f485
parent b9d0d209cd
2 changed files with 7 additions and 1 deletions
--- 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

--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@ -13,7 +13,7 @@ module Mastodon
    end

    def patch
-      0
+      1
    end

    def pre