Commit graph

3 commits

Author SHA1 Message Date
Sylvain Berfini
b6e4dc4740 Added new resources + added security toggle in layouts 2018-10-22 16:36:00 +02:00
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
Sylvain Berfini
53755012df Added remote provisioning login view 2014-03-03 15:44:26 +01:00