diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-12-19 12:38:59 +0100 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-12-19 12:38:59 +0100 |
commit | 669af5300f904d399edb96d17faf93104e055138 (patch) | |
tree | 483d3b752d4771ca8b822574aea6f60e62dccc4d /etc | |
parent | a8c65ab6290d9516b733273098db50721e84bcec (diff) | |
parent | 522106e207e7230da5e62fb88f2e47742fdf1b21 (diff) | |
download | nx-libs-669af5300f904d399edb96d17faf93104e055138.tar.gz nx-libs-669af5300f904d399edb96d17faf93104e055138.tar.bz2 nx-libs-669af5300f904d399edb96d17faf93104e055138.zip |
Merge branch 'uli42-pr/x2go_bypass' into 3.6.x
Attributes GH PR #744: https://github.com/ArcticaProject/nx-libs/pull/744
Diffstat (limited to 'etc')
0 files changed, 0 insertions, 0 deletions