Guillaume BIENKOWSKI 336c43e5ba Merge branch 'messages' ... Conflicts: Classes/LinphoneManager.m		2014-05-20 11:41:28 +02:00
..
.gitignore	Add files to .gitignore	2012-09-11 17:58:57 +02:00
project.pbxproj	Merge branch 'messages'	2014-05-20 11:41:28 +02:00