conversations - copy of conversations repo

	Commit message (Collapse)	Author	Age	Files	Lines
*	refactored bodyContainsDownloadable to be more flexible	Daniel Gultsch	2015-06-30	1	-1/+1
\|
*	untested pgp support for http upload	Daniel Gultsch	2015-06-29	1	-5/+9
\|
*	do not check image file size over http if accepted file size is 0	Daniel Gultsch	2015-01-11	1	-3/+6
\|
*	some mime and pgp fixes for file transfer	iNPUTmice	2014-11-15	1	-20/+1
\|
*	support for pgp files	iNPUTmice	2014-11-15	1	-2/+4
\|
*	Rework `Account.getJid()' to return full JIDs	Sam Whited	2014-11-09	1	-7/+7
\| \| \| \|	Remove `Account.getFullJid()'
*	Move a chunk of classes over to using JID objects	Sam Whited	2014-11-09	1	-27/+13
\|
*	Merge branch 'gradle' into development	Sam Whited	2014-10-30	1	-18/+27
\| \| \| \| \| \| \| \| \| \|	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/+385