Merge branch 'dev_group_chat' of git.linphone.org:linphone-android into dev_group_chat

[--force]
This commit is contained in:
Simon Morlat 2018-03-09 22:17:31 +01:00
commit 4cf767aa72

View file

@ -2,8 +2,8 @@
<manifest package="org.linphone" <manifest package="org.linphone"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:installLocation="auto" android:installLocation="auto"
android:versionCode="3991" android:versionCode="3992"
android:versionName="3.99.1"> android:versionName="3.99.2">
<uses-sdk <uses-sdk
android:minSdkVersion="16" android:minSdkVersion="16"