conversations - copy of conversations repo

	Commit message (Collapse)	Author	Age	Files	Lines
*	made scan and show qr code more accessible in VerifyOtrActivity	iNPUTmice	2014-11-16	1	-0/+20
\|
*	made file transfers cancelable	iNPUTmice	2014-11-15	1	-0/+3
\|
*	basic arbitrary file transfer	iNPUTmice	2014-11-15	1	-2/+1
\|
*	made qr code available from muc and contact details as well	iNPUTmice	2014-11-04	2	-0/+8
\|
*	unfinishd qr code implemenation. thanks to @emdete	iNPUTmice	2014-11-03	2	-6/+18
\|
*	Merge branch 'gradle' into development	Sam Whited	2014-10-30	1	-0/+20
\| \| \| \| \| \| \| \| \| \|	Conflicts: .gitignore CHANGELOG.md README.md libs/MemorizingTrustManager libs/minidns libs/openpgp-api-lib
*	Make conversations the root project	Sam Whited	2014-10-22	12	-0/+256