From 50ce347ef96690767b21ee01d6a785166c583b6b Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Tue, 30 Oct 2018 22:06:59 +0100
Subject: Bump version to 2.6.0 (#9149)

* Bump version to 2.6.0

* Update CHANGELOG.md
---
 lib/mastodon/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index e4c5b9cbd..7cc837345 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -21,7 +21,7 @@ module Mastodon
     end
 
     def flags
-      'rc4'
+      ''
     end
 
     def to_a
-- 
cgit 


From ba06a5f485d305bc917506828fd5cb20b3f0c226 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 31 Oct 2018 01:04:45 +0100
Subject: Bump version to 2.6.1 (#9172)

---
 CHANGELOG.md            | 6 ++++++
 lib/mastodon/version.rb | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'lib')

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
-- 
cgit