From b38e26f1af6c94f1112786287b5a2117bd0496fa Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Mon, 24 Aug 2020 12:39:44 -0300
Subject: [PATCH] Add missing entry to history-manual.json
---
.github/history-manual.json | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/.github/history-manual.json b/.github/history-manual.json
index 984498859c9..67dcdc88ac9 100644
--- a/.github/history-manual.json
+++ b/.github/history-manual.json
@@ -21,5 +21,12 @@
"title": "[BREAK] TLS v1.0 and TLS v1.1 were disabled by due to NodeJS update to v12. You can still enable them by using flags like `--tls-min-v1.0` and `--tls-min-v1.1`",
"userLogin": "sampaiodiego",
"contributors": []
+ }],
+ "3.6.0-rc.0": [{
+ "pr": "18642",
+ "title": "[NEW] Admin option to reset other users’ E2E encryption key",
+ "userLogin": "rodrigok",
+ "contributors": [],
+ "description": "Requires the 2FA password fallback enforcement enabled to work"
}]
}
--
GitLab