Merge branch 'dev' into feature/session-id-blinding-part-2

3 years ago · a154b56e22
parent 1c575e520d cc495bccc1
commit a154b56e22
2 changed files with 11 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@ -27,7 +27,6 @@ DerivedData
 *.ipa
 *.xcuserstate
 Index/
 Session-Turn-Server
 # CocoaPods
 Pods
--- a/Session/Meta/TurnServers/Session-Turn-Server
+++ b/Session/Meta/TurnServers/Session-Turn-Server
@ -0,0 +1,11 @@
 {
    "urls": ["turn:freyr.getsession.org",
             "turn:fenrir.getsession.org",
             "turn:frigg.getsession.org",
             "turn:angus.getsession.org",
             "turn:hereford.getsession.org",
             "turn:holstein.getsession.org",
             "turn:brahman.getsession.org"],
    "username": "session202111",
    "password": "053c268164bc7bd7"
 }