Daniel Gultsch 7bd0f31244 Merge branch 'master' into development		2015-08-23 17:57:53 +02:00
..
AbstractConnectionManager.java	do not touch pictures that are already in the right format	2015-08-11 16:50:00 +02:00
AvatarService.java	loading avatars in seperate tasks	2015-02-15 18:48:05 +01:00
EventReceiver.java	Optimize imports	2015-07-20 14:26:29 +02:00
MessageArchiveService.java	introduce special iq type for internal timeouts. always use != result to check for error in callbacks	2015-08-23 17:53:23 +02:00
NotificationService.java	show http downloaded images in notification	2015-07-29 01:57:08 +02:00
XmppConnectionService.java	Merge branch 'master' into development	2015-08-23 17:57:53 +02:00