Bump version to 2.6.0 (#9149)

* Bump version to 2.6.0 * Update CHANGELOG.md
7 years ago · 50ce347ef9
parent 804586172e
commit 50ce347ef9
2 changed files with 10 additions and 10 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -3,7 +3,7 @@ Changelog

 All notable changes to this project will be documented in this file.

-## [Unreleased]
+## [2.6.0] - 2018-10-30
 ### Added

 - Add link ownership verification (#8703)
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@ -21,7 +21,7 @@ module Mastodon
    end

    def flags
-      'rc4'
+      ''
    end

    def to_a