mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-19 04:28:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
3314 commits 37 branches 183 tags 128 MiB
Commit graph

3 commits

Author SHA1 Message Date
Margaux Clerc
cff637fbb2 Fix tests 2016-02-15 13:57:23 +01:00
Margaux Clerc
6614704d21 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
e4e48b4956 Rename/Delete/add assets 2015-08-25 17:22:32 +02:00