conversations - copy of conversations repo

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-03-29	1	-6/+3
\|\
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-03-29	1	-2/+4
\|\\|
\| *	renaming eu.siacs.conversations to de.thedevstack.conversationsplus	steckbrief	2015-06-19	1	-446/+0
* \|	use extract account from intent method and final EXTRA_ACCOUNT variable	Daniel Gultsch	2016-01-22	1	-3/+2
\|/
*	limit ui refresh rate	iNPUTmice	2015-02-17	1	-6/+6
*	some further otr improvements	Daniel Gultsch	2015-01-02	1	-2/+8
*	improved OTR verification part one	Daniel Gultsch	2015-01-02	1	-129/+171
*	verify contacts key only on initiating side of smp	iNPUTmice	2014-11-21	1	-3/+10
*	made scan and show qr code more accessible in VerifyOtrActivity	iNPUTmice	2014-11-16	1	-7/+101
*	parse otr-fingerprint in qr codes and nfc. include otr fingerprint in shareab...	iNPUTmice	2014-11-16	1	-2/+3
*	Make account status an enum	Sam Whited	2014-11-15	1	-1/+1
*	check if account is online before doing smpfeature/otr_verification	iNPUTmice	2014-11-12	1	-11/+24
*	Merge branch 'feature/otr_verification' of https://github.com/siacs/Conversat...	iNPUTmice	2014-11-11	1	-1/+0
\|\
\| *	small bug fix	iNPUTmice	2014-11-10	1	-8/+3
\| *	added snackbar to indicate smp. more error handling in verify activity	iNPUTmice	2014-11-10	1	-47/+81
\| *	initial smp support	iNPUTmice	2014-11-10	1	-0/+264
*	use auto register for verify otr listeners	iNPUTmice	2014-11-11	1	-9/+0
*	small bug fix	iNPUTmice	2014-11-11	1	-8/+3
*	added snackbar to indicate smp. more error handling in verify activity	iNPUTmice	2014-11-11	1	-47/+81
*	initial smp support	iNPUTmice	2014-11-11	1	-0/+264