mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-02-07 06:49:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
linphone-android/src/org/linphone/xmlrpc
History
Margaux Clerc 0da687df64 Merge branch 'master' into dev_in_app_purchase 
Conflicts:
	AndroidManifest.xml
	res/raw/linphonerc_factory
	res/values/non_localizable_custom.xml
	res/xml/preferences.xml
	src/org/linphone/LinphonePreferences.java
	src/org/linphone/SettingsFragment.java
	src/org/linphone/compatibility/ApiFivePlus.java
	src/org/linphone/setup/SetupActivity.java
	src/org/linphone/xmlrpc/XmlRpcHelper.java
	src/org/linphone/xmlrpc/XmlRpcListener.java
	src/org/linphone/xmlrpc/XmlRpcListenerBase.java
2016-06-28 14:56:42 +02:00
..
XmlRpcHelper.java Merge branch 'master' into dev_in_app_purchase 2016-06-28 14:56:42 +02:00
XmlRpcListener.java Add fetch remote provisioning with xmlrpc 2015-11-03 18:43:04 +01:00
XmlRpcListenerBase.java Merge branch 'master' into dev_in_app_purchase 2016-06-28 14:56:42 +02:00