From e8a4ba49cfda3b7461fe349266a6ea479e667bf5 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 12 Oct 2018 00:22:38 +0200
Subject: [PATCH] Bump version to 2.5.2

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 220cb65915..75a51fc7c6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.5.2
+
+- Fix XSS vulnerability (#8959)
+
 ## 2.5.1
 
 - Fix some local images not having their EXIF metadata stripped on upload (#8714)
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index e6d3af35db..a49e7f102f 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -13,7 +13,7 @@ module Mastodon
     end
 
     def patch
-      1
+      2
     end
 
     def pre
-- 
GitLab