conversations - copy of conversations repo

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge tag '1.11.7' into trz/merge_1.11.7	lookshe	2016-04-17	1	-0/+1
\|\
\| *	added share uri button to conference details	Daniel Gultsch	2016-04-12	1	-0/+1
* \|	Fixes FS#143 - Displaying of emoticons too large	lookshe	2016-03-20	1	-0/+3
\|/
*	use dedicated colors for primary and primary_dark	Daniel Gultsch	2015-08-26	1	-2/+2
*	Merge branch 'CryptoNextBeta' into development	Andreas Straub	2015-07-20	1	-0/+2
\|\
\| *	Add refresh icon to v21 theme	Sam Whited	2015-07-19	1	-0/+1
\| *	Add key trust toggle to ContactDetailsActivity	Andreas Straub	2015-07-19	1	-0/+1
* \|	Change CAB to accent color in v21	Sam Whited	2015-07-19	1	-0/+3
\|/
*	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	-0/+1
*	made material icons smaller (24dp)	Daniel Gultsch	2015-04-28	1	-17/+15
*	Enable end-conversation by swipe gesture	BrianBlade	2015-04-08	1	-0/+4
*	Use Material Design Icons on API 21+	Sam Whited	2015-01-29	1	-0/+21
*	Add materials theme	Sam Whited	2015-01-06	1	-0/+14