From: FloatingGhost <hannah@coffee-and-dreams.uk>
Date: Tue, 21 Jun 2022 07:35:13 +0000 (+0100)
Subject: Merge branch 'develop' of akkoma.dev:AkkomaGang/akkoma into develop
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=de95ee7772d6a0a5f28e182d0bff3afc38cfe500;hp=8e3115e87b0747db598bc6da9348557d7e83313a;p=akkoma

Merge branch 'develop' of akkoma.dev:AkkomaGang/akkoma into develop
---

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4b3847049..a9ee14f0e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,29 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## [Unreleased]
+
+## 2.5.2
+
+### Added
+- Allow posting and recieving of misskey markdown (requires text/x.misskeymarkdown in `allowed_post_formats`)
+
+### Changed
+- Set frontend URLs to akkoma-maintained ones
+
+### Fixed
+- Updated `no_empty` MRF to not error when recieving misskey markdown
+
+## 2.5.1
+
+### Added
+- Elasticsearch Search provider support
+- Enabled custom emoji reactions to posts via `/api/v1/pleroma/statuses/:id/reactions/:shortcode:`
+- Added continuous integration builds for x86 glibc and musl
+
+### Fixed
+- Enabled support for non-standard AP entities, such as those used by bookwyrm
+
 ## 2.5.0 - 10/06/2022
 
 ### Changed