Merge branch 'new_ui' into apple_store

This commit is contained in:
Jehan Monnier 2012-10-19 18:04:37 +02:00
commit ecbf641b61
2 changed files with 2 additions and 2 deletions

View file

@ -42,6 +42,6 @@ expires=604800
push_notification=1
transport=tcp
sharing_server=https://www.linphone.org:444/upload.php
ice=1
ice=0
stun=stun.linphone.org

View file

@ -42,5 +42,5 @@ expires=604800
push_notification=1
transport=tcp
sharing_server=https://www.linphone.org:444/upload.php
ice=1
ice=0
stun=stun.linphone.org