Merge branch 'master' into develop

jschaul · jschaul · commit 5e63cd009493 · 2021-03-02T23:26:44.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,17 @@
 ## Internal changes
 
 -->
+# [2020-03-02]
+
+## Bug fixes and other updates
+
+* Return PubClient instead of Client from /users/list-clients (#1391)
+
+## Internal changes
+
+* Federation: Add qualified endpoints for prekey management (#1372)
+
+
 # [2020-02-25]
 
 ## Bug fixes and other updates
