conversations - copy of conversations repo

	Commit message (Expand)	Author	Age	Files	Lines
*	Compile Clean after mergetrz/merge_1.5.2	steckbrief	2015-08-11	1	-22/+16
*	Merged 1.5.2 into trz/master with conflicts resolved	steckbrief	2015-08-11	1	-51/+77
\|\
\| *	renamed colors	Daniel Gultsch	2015-07-13	1	-6/+6
\| *	fixed regression where the selected conversation wasn't highlighted anymore o...	iNPUTmice	2015-04-13	1	-1/+1
\| *	Enable end-conversation by swipe gesture	BrianBlade	2015-04-08	1	-60/+78
* \|	changed last message in overview also to EmojiconTextView for displaying smil...	lookshe	2015-04-12	1	-3/+6
* \|	- Avoiding accessing shared preferences to know if emoticons should be parsed...	steckbrief	2015-01-20	1	-1/+11
\|/
*	Make conversations the root project	Sam Whited	2014-10-22	1	-0/+68