summaryrefslogtreecommitdiff
path: root/changelog.d
diff options
context:
space:
mode:
authorfeld <feld@feld.me>2024-05-30 15:38:18 +0000
committerfeld <feld@feld.me>2024-05-30 15:38:18 +0000
commitff6f5a417f1f22d53b1196cc19e1ba9ad6e0ed2c (patch)
tree79d90bb408661a4a750f3542f0beb80b1d9fbe7b /changelog.d
parent6feb536e79e1d639b8e143451848fbfb33ee2a3f (diff)
parentf5065eaf99a76695df26966055f90368df7043f3 (diff)
downloadpleroma-ff6f5a417f1f22d53b1196cc19e1ba9ad6e0ed2c.tar.gz
pleroma-ff6f5a417f1f22d53b1196cc19e1ba9ad6e0ed2c.zip
Merge branch 'mrf-nsfw-otp25' into 'develop'
Fix Logger.warn deprecation error on OTP25 See merge request pleroma/pleroma!4135
Diffstat (limited to 'changelog.d')
-rw-r--r--changelog.d/mrf-nsfw-otp25.skip1
1 files changed, 1 insertions, 0 deletions
diff --git a/changelog.d/mrf-nsfw-otp25.skip b/changelog.d/mrf-nsfw-otp25.skip
new file mode 100644
index 000000000..e804f19a0
--- /dev/null
+++ b/changelog.d/mrf-nsfw-otp25.skip
@@ -0,0 +1 @@
+noop