You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@guacamole.apache.org by mj...@apache.org on 2019/06/22 21:57:16 UTC

[guacamole-manual] 01/01: Merge 1.1.0 changes back to master.

This is an automated email from the ASF dual-hosted git repository.

mjumper pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/guacamole-manual.git

commit 6df18f34fbb156120725176dfa914c6f59d79751
Merge: 9d9d238 1e9c6b1
Author: Michael Jumper <mj...@apache.org>
AuthorDate: Sat Jun 22 14:56:57 2019 -0700

    Merge 1.1.0 changes back to master.

 src/chapters/configuring.xml | 6 +++++-
 src/chapters/totp-auth.xml   | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)