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-manual.git
commit e16c4295d3a42bbc367a3ca05b04e324ec8a7d37 Merge: 232d99f c8ac607 Author: Nick Couchman <nick_couch...@cotyinc.com> AuthorDate: Sat Feb 9 15:10:32 2019 -0500 Merge 1.1.0 changes back to master. src/chapters/adhoc-connections.xml | 4 ++-- src/chapters/cas-auth.xml | 4 ++-- src/chapters/configuring.xml | 8 ++++---- src/chapters/custom-auth.xml | 12 ++++++------ src/chapters/duo-auth.xml | 4 ++-- src/chapters/event-listeners.xml | 12 ++++++------ src/chapters/guacamole-ext.xml | 4 ++-- src/chapters/header-auth.xml | 4 ++-- src/chapters/installing.xml | 14 +++++++------- src/chapters/jdbc-auth.xml | 16 ++++++++-------- src/chapters/ldap-auth.xml | 4 ++-- src/chapters/openid-auth.xml | 4 ++-- src/chapters/radius-auth.xml | 6 +++--- src/chapters/totp-auth.xml | 4 ++-- src/chapters/yourown.xml | 12 ++++++------ src/gug.xml | 4 ++-- tutorials/guacamole-auth-tutorial/pom.xml | 4 ++-- .../src/main/resources/guac-manifest.json | 2 +- tutorials/guacamole-tutorial/pom.xml | 6 +++--- 19 files changed, 64 insertions(+), 64 deletions(-)