conversations - copy of conversations repo

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-03-06	1	-7/+35
\|\
\| *	Merge tag '1.9.3' into trz/merge_1.9.3	lookshe	2016-02-11	1	-7/+35
\|/\|
\| *	decreased right hand side padding in contact keys	Daniel Gultsch	2015-08-08	1	-1/+3
\| *	Highlight selected message's fingerprint in list	Andreas Straub	2015-07-29	1	-0/+1
\| *	fixed monospace font and android L	Daniel Gultsch	2015-07-20	1	-1/+2
\| *	Use MD style for key trust toggle switch	Andreas Straub	2015-07-20	1	-1/+1
\| *	Refactor trust key ui and show in account details	Andreas Straub	2015-07-19	1	-9/+11
\| *	Add key trust toggle to ContactDetailsActivity	Andreas Straub	2015-07-19	1	-0/+10
\| *	Display trust status in ContactDetailsActivity	Andreas Straub	2015-07-19	1	-3/+15
\| *	renamed colors	Daniel Gultsch	2015-07-13	1	-2/+2
\| *	increased padding on image buttons on v21 to match material guidelines	Daniel Gultsch	2015-04-28	1	-1/+1
* \|	Fixes FS#75 - Change color names to reasonable names	steckbrief	2015-12-04	1	-2/+2
* \|	Merge tag '1.5.2' into trz/rebasetrz/1.5.2.1	lookshe	2015-08-11	1	-3/+3
\|/
*	Use Material Design Icons on API 21+	Sam Whited	2015-01-29	1	-1/+1
*	Make conversations the root project	Sam Whited	2014-10-22	1	-0/+41