From: lain <lain@soykaf.club>
Date: Sat, 8 Feb 2020 14:02:36 +0000 (+0000)
Subject: Merge branch 'fix/upload-limit-otp' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=964b4d82a0cde5b552b6210400c5e2c747a2f0e0;p=akkoma

Merge branch 'fix/upload-limit-otp' into 'develop'

Actually fix upload limit on OTP releases

Closes #1109

See merge request pleroma/pleroma!2185
---

964b4d82a0cde5b552b6210400c5e2c747a2f0e0
diff --cc CHANGELOG.md
index 8e316f6f6,dced36723..1c6ad4fd9
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -120,8 -120,8 +120,9 @@@ The format is based on [Keep a Changelo
  - MRF: `Delete` activities being exempt from MRF policies
  - OTP releases: Not being able to configure OAuth expired token cleanup interval
  - OTP releases: Not being able to configure HTML sanitization policy
+ - OTP releases: Not being able to change upload limit (again)
  - Favorites timeline now ordered by favorite date instead of post date
 +- Support for cancellation of a follow request
  <details>
    <summary>API Changes</summary>