Merge branch 'new_ui' into apple_store

This commit is contained in:
Jehan Monnier 2012-10-22 09:06:42 +02:00
commit fc3bfef0e3
2 changed files with 2 additions and 2 deletions

View file

@ -8,7 +8,7 @@ edge_bw=10
[sip]
guess_hostname=1
inc_timeout=15
inc_timeout=45
use_info=0
use_ipv6=0
register_only_when_network_is_up=1

View file

@ -8,7 +8,7 @@ edge_bw=10
[sip]
guess_hostname=1
inc_timeout=15
inc_timeout=45
use_info=0
use_ipv6=0
register_only_when_network_is_up=1