conversations - copy of conversations repo

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge tag '1.12.4' into trz/merge_1.12.4 (not tested yet)trz/merge_1.12.4	lookshe	2016-05-26	1	-0/+15
\|\
\| *	pulled translations from transifex	Daniel Gultsch	2016-05-02	1	-0/+15
* \|	Merge tag '1.11.7' into trz/merge_1.11.7	lookshe	2016-04-17	1	-3/+0
\|\\|
\| *	pulled translations from transifex	Daniel Gultsch	2016-04-10	1	-3/+0
* \|	pulled from transifex	lookshe	2016-03-23	1	-0/+3
* \|	Merge tag '1.11.0' into trz/merge_1.11.0	lookshe	2016-03-08	1	-3/+11
\|\\|
\| *	pulled translations from transifex	Daniel Gultsch	2016-03-06	1	-3/+11
* \|	Fixes FS#146: Remove Tor-Support	steckbrief	2016-03-02	1	-3/+0
* \|	Removed stupid message correction	steckbrief	2016-02-23	1	-2/+0
* \|	Removed useless 'button-message' to load more messages. Implementation alread...	steckbrief	2016-02-23	1	-1/+0
* \|	Merge tag '1.10.0' into trz/merge_1.10.0	lookshe	2016-02-22	1	-8/+26
\|\\|
\| *	pulled translations from transifex	Daniel Gultsch	2016-02-19	1	-8/+14
\| *	pulled translations from transifex	Daniel Gultsch	2016-02-15	1	-0/+12
* \|	Unused preference 'picture_compression'. This feature is configured in our va...	steckbrief	2016-02-13	1	-2/+0
* \|	green bubbles and setting to choose green or white bubbles removed	steckbrief	2016-02-12	1	-2/+0
\|/
*	pulled translations from transifex	Daniel Gultsch	2016-01-20	1	-1/+546
*	pulled translations for 1.9.0 release from transifex1.9.0	Daniel Gultsch	2016-01-14	1	-0/+2