conversations - copy of conversations repo

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-03-11	1	-1/+1
\|\
\| *	Fixes FS#139: Do not merge messages at all	steckbrief	2016-03-11	1	-1/+1
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2016-03-10	1	-3/+4
\|\\|
\| *	Fixes FS#158: user decision dialog heading configurable and translateable	steckbrief	2016-03-10	1	-3/+4
\| *	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-03-06	1	-1/+1
\| \|\ \| \|/ \|/\|
* \|	Imports organized	steckbrief	2016-02-12	1	-1/+0
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-12-16	1	-1/+2
\|\\|
\| *	Fixes FS#95: NPE when opening message details for failed file transfer	steckbrief	2015-12-16	1	-1/+2
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-12-10	1	-1/+2
\|\\|
\| *	Moved logcat to a module, increased error robustness for loading last messages	steckbrief	2015-12-10	1	-1/+1
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-12-04	1	-7/+2
\|\\|
\| *	Fixes FS#75 - Change color names to reasonable names	steckbrief	2015-12-04	1	-7/+2
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-12-02	1	-2/+2
\|\\|
\| *	Implements FS#67: Introduce central logging class to use log prefix, new acti...	steckbrief	2015-11-20	1	-2/+2
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-11-03	2	-1/+72
\|\\|
\| *	Implements FS#26: Introduction of dialog to choose whether to resize a pictur...	steckbrief	2015-11-03	2	-1/+72
* \|	fixed importstrz/1.5.2.2	lookshe	2015-10-05	2	-5/+5
\|/
*	Publishing additional information in message details dialog such as message t...	steckbrief	2015-10-04	1	-18/+142
*	Implements FS#72, FS#72, FS#73, FS#65, FS#66 - Resource List Dialog added, Op...	steckbrief	2015-10-04	2	-0/+184