conversations - copy of conversations repo

	Commit message (Collapse)	Author	Age	Files	Lines
*	happy hanukkah	iNPUTmice	2014-11-16	2	-1/+20
\|
*	made scan and show qr code more accessible in VerifyOtrActivity	iNPUTmice	2014-11-16	1	-5/+5
\|
*	added snackbar to indicate smp. more error handling in verify activity	iNPUTmice	2014-11-11	1	-0/+12
\|
*	initial smp support	iNPUTmice	2014-11-11	2	-60/+177
\|
*	reformated license a bit	iNPUTmice	2014-11-04	1	-3/+3
\|
*	Shorten license text and fix height of scrollview	Sam Whited	2014-11-04	1	-2/+2
\|
*	Use normal text size and color	Sam Whited	2014-11-04	1	-1/+4
\|
*	Make links clickable in about text	Sam Whited	2014-11-04	1	-1/+3
\|
*	Convert about dialog to activity	Sam Whited	2014-11-04	1	-0/+16
\|
*	show avatar in editaccount	iNPUTmice	2014-11-04	1	-4/+14
\|
*	Wrap "last seen" time.	Sam Whited	2014-11-03	1	-2/+1
\| \| \| \|	Fixes #611
*	Merge branch 'gradle' into development	Sam Whited	2014-10-30	2	-4/+4
\| \| \| \| \| \| \| \| \| \|	Conflicts: .gitignore CHANGELOG.md README.md libs/MemorizingTrustManager libs/minidns libs/openpgp-api-lib
*	Make conversations the root project	Sam Whited	2014-10-22	24	-0/+1435