conversations - copy of conversations repo

	Commit message (Collapse)	Author	Age	Files	Lines
*	context menu for files and offered files. fixed #848 fixed #849	Daniel Gultsch	2015-01-12	1	-2/+2
\|
*	made file transfers cancelable	iNPUTmice	2014-11-15	1	-0/+3
\|
*	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