summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2018-10-12 00:22:38 +0200
committerEugen Rochko <eugen@zeonfederated.com>2018-10-12 00:22:38 +0200
commite8a4ba49cfda3b7461fe349266a6ea479e667bf5 (patch)
treeb6e34422488d273bfe9c6877ec9e8127b5182bb2
parent1787704e1c283410481b44cd0128dac8b52e087d (diff)
Bump version to 2.5.2v2.5.2
-rw-r--r--CHANGELOG.md4
-rw-r--r--lib/mastodon/version.rb2
2 files changed, 5 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 220cb65915c..75a51fc7c6e 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 e6d3af35dbf..a49e7f102f6 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