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

Posted to commits@guacamole.apache.org by jm...@apache.org on 2023/07/14 17:52:16 UTC

[guacamole-manual] branch master updated (d6d66ca -> 0306e71)

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

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


    from d6d66ca  GUACAMOLE-1833: Merge removal of merge conflict markers.
     add 15a118e  GUACAMOLE-1834: Include required '%s' for extlinks configuration.
     add 6ce4727  GUACAMOLE-1834: Merge required '%s' for extlinks configuration.
     new 0306e71  Merge 1.5.3 changes back to master.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/conf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

Posted by jm...@apache.org.

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

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

commit 0306e71effb3dc111f1194c8fa05d4cff0bd00ec
Merge: d6d66ca 6ce4727
Author: James Muehlner <ja...@guac-dev.org>
AuthorDate: Fri Jul 14 17:51:59 2023 +0000

    Merge 1.5.3 changes back to master.

 src/conf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)