From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 11 Oct 2018 22:24:09 +0000 (+0200)
Subject: Bump version to 2.5.2 (#8960)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=ef43f1d2caf874ecc6d82f44e9f2bab5a6e64144;p=mastodon.git

Bump version to 2.5.2 (#8960)
---

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 220cb6591..75a51fc7c 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 e6d3af35d..a49e7f102 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