conversations - copy of conversations repo

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'trz/rebase' into trz/rename	steckbrief	2017-01-05	1	-6/+28
*	Implements FS#235: Deletion of remote files uploaded via httpupload	steckbrief	2016-09-29	1	-6/+4
*	FileTransfer reworked (first steps - functionality as is), HttpUpload	steckbrief	2016-05-29	1	-2/+3
*	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-03-25	1	-5/+1
*	completely implements FS#161	lookshe	2016-03-17	1	-4/+1
*	partially implements FS#161	lookshe	2016-03-16	1	-17/+29
*	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-03-12	1	-7/+8
*	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-03-08	1	-68/+76
*	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-03-07	1	-1/+3
*	Merge branch 'trz/rebase' into trz/rename	lookshe	2016-03-06	1	-102/+168
*	Implements FS#19, FS#84; Introduces ImageResizeException, MessageUtil and dis...	steckbrief	2015-12-16	1	-1/+2
*	Moved logcat to a module, increased error robustness for loading last messages	steckbrief	2015-12-10	1	-1/+1
*	Implements FS#67: Introduce central logging class to use log prefix, new acti...	steckbrief	2015-11-20	1	-3/+3
*	FileBackend splitted into several util classes for separate concerns: AvatarU...	steckbrief	2015-11-06	1	-2/+3
*	Fixes FS#47: WiFi only setting in unencrypted chats bug fixed, typo in values...	steckbrief	2015-10-23	1	-1/+2
*	Merge branch 'trz/rebase' into trz/rename	lookshe	2015-08-21	1	-3/+3
*	Merge branch 'trz/rebase' into trz/rename	lookshe	2015-08-11	1	-0/+269