This is an automated email from the ASF dual-hosted git repository. vnick pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/guacamole-client.git
commit 2bb561f9fee10d70eb1ca427525f3859ba364dff Merge: ed7746e a608fa2 Author: Virtually Nick <[email protected]> AuthorDate: Fri Mar 11 15:56:48 2022 -0500 GUACAMOLE-1550: Merge allow TOTP key to be cleared by setting its generation status. .../apache/guacamole/auth/totp/user/TOTPUser.java | 48 +++++++++++----------- .../guacamole/auth/totp/user/TOTPUserContext.java | 2 +- .../src/main/resources/translations/en.json | 6 +-- 3 files changed, 29 insertions(+), 27 deletions(-)
