conversations - copy of conversations repo

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'trz/rebase' into trz/rename	lookshe	2015-08-21	1	-3/+3
\|\
* \|	moved merged files to correct location	lookshe	2015-08-16	3	-0/+167
* \|	Merge branch 'trz/rebase' into trz/rename	lookshe	2015-08-16	14	-409/+222
\|\\|
* \|	resolve of some compiler errors	lookshe	2015-08-13	3	-1/+3
* \|	Merge branch 'trz/rebase' into trz/rename	lookshe	2015-08-11	61	-2115/+3783
\|\\|
* \|	Show Online status in contact list with respect to SHOW_ONLINE_STATUS preference	steckbrief	2015-06-19	1	-2/+5
* \|	Status color added to "create conversation" (refers to ticket #22 in flyspray)	steckbrief	2015-06-19	5	-0/+34
* \|	renaming eu.siacs.conversations to de.thedevstack.conversationsplus	steckbrief	2015-06-19	126	-0/+26180
\|/
*	changed received and read confirmation setting to one list and put it to sett...	lookshe	2015-04-14	1	-1/+19
*	new settings to initialisation of Settings	lookshe	2015-04-12	1	-1/+1
*	added settings for accepting and downloading files	lookshe	2015-04-12	1	-2/+16
*	Color choose dialog	steckbrief	2015-04-11	1	-1/+8
*	- Avoiding accessing shared preferences to know if emoticons should be parsed...	steckbrief	2015-01-20	1	-0/+55