Conversations/src/main/java/eu/siacs/conversations/services
iNPUTmice 02a89f4ce2 Merge branch 'feature/mam' into development
Conflicts:
	src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
2014-12-13 13:55:24 +01:00
..
AbstractConnectionManager.java Make conversations the root project 2014-10-22 15:47:11 -04:00
AvatarService.java cleaned up avatar / tile creation 2014-12-03 00:06:57 +01:00
EventReceiver.java Make conversations the root project 2014-10-22 15:47:11 -04:00
MessageArchiveService.java various mam improvments 2014-12-13 12:25:52 +01:00
NotificationService.java put error notification into notification service 2014-11-18 15:26:28 +01:00
XmppConnectionService.java Merge branch 'feature/mam' into development 2014-12-13 13:55:24 +01:00