conversations - copy of conversations repo

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merged 1.5.2 into trz/master with conflicts resolved	steckbrief	2015-08-11	1	-6/+26
\|\
\| *	pulled translations	Daniel Gultsch	2015-07-18	1	-0/+2
\| \|
\| *	made 'check image on http host' message more generic. fixed #1281	Daniel Gultsch	2015-07-16	1	-5/+3
\| \|
\| *	pulled translations from transifex	Daniel Gultsch	2015-05-20	1	-0/+5
\| \|
\| *	pulled translations from transifex	Daniel Gultsch	2015-04-26	1	-0/+11
\| \|
\| *	added missing translations from transifex	Daniel Gultsch	2015-04-21	1	-1/+5
\| \|
* \|	added settings for accepting and downloading files	lookshe	2015-04-12	1	-1/+1
\|/ \| \| \|	fix in Settings, initialize with same values like in preferences.xml
*	pulled translations	iNPUTmice	2015-03-22	1	-0/+4
\|
*	pulled new translations from transifex	iNPUTmice	2015-03-16	1	-4/+282
\|
*	pulled new translations from transifex	iNPUTmice	2015-02-27	1	-0/+152