conversations-plus - improved conversations

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'development' of https://github.com/siacs/Conversations into dev...	iNPUTmice	2014-11-09	1	-2/+2
\|\
\| *	Rework `Account.getJid()' to return full JIDs	Sam Whited	2014-11-09	1	-2/+2
* \|	Merge branch 'master' into development	iNPUTmice	2014-11-09	1	-14/+22
\|\ \ \| \|/ \|/\|
\| *	make avatar service not break on empty names	iNPUTmice	2014-11-09	1	-14/+22
* \|	Create avatar's for JID's w/o localparts	Sam Whited	2014-11-09	1	-3/+3
* \|	Fields that we sync on should be final	Sam Whited	2014-11-09	1	-1/+1
* \|	Update more files to use JID objects	Sam Whited	2014-11-09	1	-1/+1
\|/
*	fixed #617	iNPUTmice	2014-11-05	1	-26/+22
*	Merge branch 'gradle' into development	Sam Whited	2014-10-30	1	-6/+0
*	Make conversations the root project	Sam Whited	2014-10-22	1	-0/+298