conversations - copy of conversations repo

	Commit message (Expand)	Author	Age	Files	Lines
*	Fixed merge issue for resolving FS#47 (preferences involved in the decision f...	steckbrief	2016-02-24	1	-10/+0
*	Imports organized	steckbrief	2016-02-12	1	-1/+0
*	Merge tag '1.9.3' into trz/merge_1.9.3	lookshe	2016-02-11	1	-0/+129
\|\
\| *	fix cancelation of http downloads and enable resume	Daniel Gultsch	2015-12-11	1	-1/+9
\| *	request storage permission when needed on Android 6.0	Daniel Gultsch	2015-12-07	1	-0/+11
\| *	do not touch pictures that are already in the right format	Daniel Gultsch	2015-08-11	1	-9/+5
\| *	put wake locks on out of band file transfers	Daniel Gultsch	2015-08-10	1	-0/+7
\| *	report wrong file size in otr encrypted jingle file transfers to be compatibl...	Daniel Gultsch	2015-08-10	1	-1/+2
\| *	enable axolotl encryption for jingle supported file transfers	Daniel Gultsch	2015-08-01	1	-0/+97
* \|	Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase	steckbrief	2015-10-23	1	-4/+0
\|\ \
* \| \|	Merge trz/rename into trz/rebase	steckbrief	2015-10-22	1	-7/+3
\|\\| \| \| \|/ \|/\|
\| *	renaming eu.siacs.conversations to de.thedevstack.conversationsplus	steckbrief	2015-06-19	1	-23/+0
\|/
*	Make conversations the root project	Sam Whited	2014-10-22	1	-0/+23