Merge branch 'master' into sk-tpr

This commit is contained in:
Shane Kilkelly 2016-04-19 13:56:54 +01:00
commit ce34ce6865

View file

@ -396,7 +396,7 @@ module.exports =
# starttls: true # starttls: true
# tlsOptions: # tlsOptions:
# rejectUnauthorized: false # rejectUnauthorized: false
# ca: '/etc/ldap/ca_certs.pem' # ca: ['/etc/ldap/ca_certs.pem']
#templateLinks: [{ #templateLinks: [{
# name : "CV projects", # name : "CV projects",