conversations - copy of conversations repo

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge tag '1.9.3' into trz/merge_1.9.3	lookshe	2016-02-11	1	-35/+47
\|\
\| *	load avatars in message adapter in background task	Daniel Gultsch	2015-10-29	1	-2/+2
\| *	show encryption type in warned/red messages	Daniel Gultsch	2015-10-28	1	-0/+11
\| *	changed text selection color	Daniel Gultsch	2015-08-05	1	-0/+1
\| *	fixed some colors in message adapter	Daniel Gultsch	2015-07-30	1	-1/+0
\| *	very subtle	Daniel Gultsch	2015-07-21	1	-9/+11
\| *	changed sizes of avatars and padding in new message bubbles	Daniel Gultsch	2015-07-20	1	-10/+11
\| *	changed message bubble appearance	Raphael Pohl	2015-07-20	1	-28/+27
\| *	fixed some ux glitches in editaccount	Daniel Gultsch	2015-07-16	1	-1/+0
\| *	renamed colors	Daniel Gultsch	2015-07-13	1	-4/+4
* \|	Fixes FS#75 - Change color names to reasonable names	steckbrief	2015-12-04	1	-3/+3
* \|	Fixes FS#50: Replace phone numbers and email addresses in messages with links	steckbrief	2015-09-02	1	-1/+1
* \|	Merge tag '1.5.2' into trz/rebasetrz/1.5.2.1	lookshe	2015-08-11	1	-5/+4
* \|	whatsapp-like smiley implementation	lookshe	2015-04-12	1	-3/+6
\|/
*	Merge branch 'gradle' into development	Sam Whited	2014-10-30	1	-2/+2
*	Make conversations the root project	Sam Whited	2014-10-22	1	-0/+97