Commit 0bbf9da7 authored by Tristan Matthews's avatar Tristan Matthews

Merge branch 'master' of...

Merge branch 'master' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone into fix_contact_header
parents ada92ae8 fc375e45
---
accounts:
- alias: SFL test
codecs: 0/3/8/9/110/111/112/
credential:
- Account.password: 1234
Account.realm:
Account.username: sfltest
displayName:
dtmfType: overrtp
enable: false
hostname: localhost
id: Account:1334389473
interface: default
mailbox:
port: 5060
publishAddr: 0.0.0.0
publishPort: 5060
registrationexpire: 600
ringtoneEnabled: true
ringtonePath: /usr/share/sflphone/ringtones/konga.ul
sameasLocal: true
serviceRoute:
srtp:
enable: false
keyExchange:
rtpFallback: false
stunEnabled: false
stunServer: stun.sflphone.org
tls:
calist:
certificate:
ciphers:
enable: false
method: TLSv1
password:
privateKey:
requireCertif: true
server:
timeout: 2
tlsPort: 5061
verifyClient: true
verifyServer: true
type: SIP
updateContact: false
username: sfltest
zrtp:
displaySas: true
displaySasOnce: false
helloHashEnabled: true
notSuppWarning: true
- alias:
codecs: 0/
credential:
......
Markdown is supported
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