linphone-android/src/org
Margaux Clerc 913e0b16d5 Merge branch 'master' into dev_phonenumber
Conflicts:
	src/org/linphone/compatibility/ApiElevenPlus.java
	src/org/linphone/compatibility/ApiTwentyThreePlus.java
	src/org/linphone/compatibility/Compatibility.java
2016-08-11 14:05:44 +02:00
..
linphone Merge branch 'master' into dev_phonenumber 2016-08-11 14:05:44 +02:00