summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2018-12-02 16:52:40 +0100
committerEugen Rochko <eugen@zeonfederated.com>2018-12-02 17:04:03 +0100
commit887f9de6dc12ef405f92b94eeaa775df74ebb1ef (patch)
tree1cefcf62272fc83ea68cd9640882b9dcac710ecf
parente625425c8feb611e037c62855845b38ceb4b35c1 (diff)
Bump version to 2.6.5v2.6.5stable-2.6
-rw-r--r--CHANGELOG.md9
-rw-r--r--lib/mastodon/version.rb2
2 files changed, 10 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d09dc452a00..1e24df451b2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,15 @@ Changelog
All notable changes to this project will be documented in this file.
+## [2.6.5] - 2018-12-01
+### Changed
+
+- Change lists to display replies to others on the list and list owner (#9324)
+
+### Fixed
+
+- Fix failures caused by commonly-used JSON-LD contexts being unavailable (#9412)
+
## [2.6.4] - 2018-11-30
### Fixed
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 9c2542ac7eb..cb5c2440cb0 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -13,7 +13,7 @@ module Mastodon
end
def patch
- 4
+ 5
end
def pre