6 commits

Author	SHA1	Message	Date
Margaux Clerc	d69d7e72fc	fix password in assistant and remove useless code	2015-09-18 15:42:55 +02:00
Margaux Clerc	6b6a39fddf	Rename/clear assistant	2015-09-15 17:38:42 +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
Margaux Clerc	4c895ecb51	Update assistant	2015-09-01 11:18:37 +02:00
Margaux Clerc	90d9193aa7	Rework assistant	2015-08-17 15:04:59 +02:00
Margaux Clerc	6780613338	Rename and delete	2015-08-17 15:01:41 +02:00