conversations - copy of conversations repo

	Commit message (Collapse)	Author	Age	Files	Lines
*	fixed merge errornfc	iNPUTmice	2014-11-03	1	-1/+0
\|
*	Merge branch 'nfc' of https://github.com/siacs/Conversations into nfc	iNPUTmice	2014-11-03	1	-0/+1
\|\ \| \| \| \| \| \| \| \|	Conflicts: src/main/AndroidManifest.xml
\| *	basic beam code / untested	iNPUTmice	2014-11-03	4	-149/+207
\| \|
* \|	use different filter for nfc intents	iNPUTmice	2014-11-03	1	-1/+1
\| \|
* \|	basic beam code / untested	iNPUTmice	2014-11-03	4	-149/+207
\| \|
* \|	create file explicitly before downloading image	iNPUTmice	2014-11-03	1	-0/+2
\| \|
* \|	Merge branch 'development' of https://github.com/siacs/Conversations into ↵	iNPUTmice	2014-11-03	1	-2/+1
\|\ \ \| \|/ \|/\| \| \|	development
\| *	Wrap "last seen" time.	Sam Whited	2014-11-03	1	-2/+1
\| \| \| \| \| \| \| \|	Fixes #611
* \|	more error handling for http connection	iNPUTmice	2014-11-03	1	-9/+12
\|/
*	version bump to 0.8.1	iNPUTmice	2014-11-03	1	-5/+6
\|
*	always use exif helper	iNPUTmice	2014-11-03	1	-23/+6
\|
*	more error handling in xmppconnection	iNPUTmice	2014-11-03	1	-66/+78
\|
*	fixed arrayoutofbounds + spelling	iNPUTmice	2014-11-01	2	-7/+7
\|
*	Merge branch 'gradle' into development	Sam Whited	2014-10-30	41	-376/+846
\| \| \| \| \| \| \| \| \| \|	Conflicts: .gitignore CHANGELOG.md README.md libs/MemorizingTrustManager libs/minidns libs/openpgp-api-lib
*	Make conversations the root project	Sam Whited	2014-10-22	313	-0/+25560