From: lain <lain@soykaf.club>
Date: Mon, 9 Dec 2019 13:52:01 +0000 (+0000)
Subject: Merge branch 'develop' into 'fix/oauth-compile-time'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=a5e28bf2145f068a264ba1eafc3dd3067672547d;p=akkoma

Merge branch 'develop' into 'fix/oauth-compile-time'

# Conflicts:
#   CHANGELOG.md
---

a5e28bf2145f068a264ba1eafc3dd3067672547d
diff --cc CHANGELOG.md
index bb1f48a28,3d578caef..d52ab341b
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -82,7 -82,7 +82,8 @@@ The format is based on [Keep a Changelo
  - Report emails now include functional links to profiles of remote user accounts
  - Not being able to log in to some third-party apps when logged in to MastoFE
  - 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
  <details>
    <summary>API Changes</summary>