Commit ed17185d authored by Matthew Smith's avatar Matthew Smith
Browse files

Merge branch 'master' into 'initcmd'

# Conflicts:
#   debian/postinst
parents 1e92d9a8 0f480838
Pipeline #762 passed with stage
in 18 seconds
......@@ -4,8 +4,6 @@ remote %%REMOTE%%
port 1194
nobind
comp-lzo
client
pkcs12 %%ORGNICK%%-%%USERNAME%%.p12
remote-cert-tls server
......
......@@ -4,8 +4,6 @@ remote %%REMOTE%%
port 1194
nobind
comp-lzo
client
remote-cert-tls server
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment