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	-25/+25
*	Merged 1.5.2 into trz/master with conflicts resolved	steckbrief	2015-08-11	1	-15/+114
\|\
\| *	Add option to remove manually approved certificates	BrianBlade	2015-04-19	1	-0/+91
\| *	maintain state when rotating settings activity	iNPUTmice	2015-04-14	1	-14/+16
\| *	Merge branch 'dont_trust_cas_preference' of https://github.com/BrianBlade/Con...	iNPUTmice	2015-04-14	1	-1/+2
\| \|\
\| \| *	Add option to use MTM without default TrustManager	BrianBlade	2015-04-11	1	-1/+2
\| * \|	don't resume old session when changing resource	iNPUTmice	2015-04-09	1	-3/+9
\| \|/
* \|	changed received and read confirmation setting to one list and put it to sett...	lookshe	2015-04-14	1	-2/+3
* \|	Merge tag '1.2.0' into trz/master	steckbrief	2015-03-30	1	-1/+1
\|\\|
\| *	avoid unnecessary thread creation	iNPUTmice	2015-03-05	1	-1/+1
* \|	Merge master-origin	steckbrief	2015-02-20	1	-0/+9
\|\\|
\| *	adapt caps on whether or not message confirmation is on	iNPUTmice	2015-01-26	1	-0/+8
* \|	- Avoiding accessing shared preferences to know if emoticons should be parsed...	steckbrief	2015-01-20	1	-14/+19
\|/
*	remove unused imports.	Michael	2014-11-21	1	-1/+0
*	turn on foreground service in expert settings	iNPUTmice	2014-11-15	1	-0/+2
*	It builds again!	Sam Whited	2014-11-09	1	-2/+4
*	Make conversations the root project	Sam Whited	2014-10-22	1	-0/+74