mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-31 02:39:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
3765 commits 40 branches 185 tags 120 MiB
Commit graph

2 commits

Author SHA1 Message Date
Margaux Clerc
c3dc710337 Merge remote-tracking branch 'linphone/master' into 3.0.X 
Conflicts:
	AndroidManifest.xml
	res/layout/chat_bubble_alt_incoming.xml
	res/layout/chat_bubble_alt_outgoing.xml
	res/layout/chat_bubble_incoming.xml
	res/layout/chat_bubble_outgoing.xml
	res/values/strings.xml
	src/org/linphone/ContactsManager.java
	src/org/linphone/compatibility/ApiFivePlus.java
	src/org/linphone/ui/BubbleChat.java
 2015-09-10 18:58:01 +02:00
Margaux Clerc
58e62cd56a Add new assets 2015-07-27 11:17:34 +02:00