Skip to content
Snippets Groups Projects
Commit dc719af6 authored by Armin Felder's avatar Armin Felder
Browse files

Merge branch 'master' into 'allowNonTls' 

# Conflicts:
#   rocketchat.cpp
parents 1f63f9cf 9075d7a8
No related branches found
No related tags found
1 merge request!56allow non tls connections
Hide whitespace changes
Inline Side-by-side
Showing
with 0 additions and 473 deletions
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

gitlab project and software management by fairkom.eu - more open source web apps at fairapps.net