conversations - copy of conversations repo

	Commit message (Collapse)	Author	Age	Files	Lines
*	more refactoring for presence selection. removed getTo, getFrom and getJid ↵	iNPUTmice	2014-11-10	1	-9/+5
\| \| \| \|	from Element
*	migrated some otr stuff to new jid classes	iNPUTmice	2014-11-09	1	-72/+73
\|
*	fixed null pointer in message merger	iNPUTmice	2014-11-09	1	-0/+1
\|
*	refactored code to always contain full jid for counterpart	iNPUTmice	2014-11-09	1	-17/+0
\|
*	Fix letter avatar selection in MUC	Sam Whited	2014-11-09	1	-0/+1
\|
*	Update another chunk of stuff to use JID objects	Sam Whited	2014-11-09	1	-7/+2
\|
*	Move a chunk of classes over to using JID objects	Sam Whited	2014-11-09	1	-28/+32
\|
*	fixed arrayoutofbounds + spelling	iNPUTmice	2014-11-01	1	-6/+6
\|
*	Merge branch 'gradle' into development	Sam Whited	2014-10-30	1	-25/+59
\| \| \| \| \| \| \| \| \| \|	Conflicts: .gitignore CHANGELOG.md README.md libs/MemorizingTrustManager libs/minidns libs/openpgp-api-lib
*	Make conversations the root project	Sam Whited	2014-10-22	1	-0/+478