iNPUTmice c494f4f7ae Merge branch 'sm' into development ... Conflicts: src/eu/siacs/conversations/services/XmppConnectionService.java		2014-08-30 09:24:58 +02:00
..
Defaults.java	publish avatars	2014-08-05 01:36:17 +02:00
EventReceiver.java	ping stuff	2014-03-11 15:44:22 +01:00
ImageProvider.java	save newly taken photos in DCIM dir	2014-08-21 09:19:18 +02:00
XmppConnectionService.java	Merge branch 'sm' into development	2014-08-30 09:24:58 +02:00