Daniel Gultsch 5a6da5afaa Merge branch 'development' of github.com:siacs/Conversations into development		2014-05-21 20:28:09 +02:00
..
crypto	reworked roster/contact handling. might break some stuff. not sycing to disk yet	2014-05-19 15:15:09 +02:00
entities	ported pending subscription support to new roster mgmt	2014-05-20 10:48:07 +02:00
parser	reworked message to conferences	2014-05-16 22:46:15 +02:00
persistance	further improvment trying to deal with large images	2014-05-21 20:27:53 +02:00
services	cleaned up shared text	2014-05-21 16:43:19 +02:00
ui	cleaned up shared text	2014-05-21 16:43:19 +02:00
utils	Fix highlight detection in MUC channels	2014-05-21 18:05:20 +02:00
xml	fixed possible npe	2014-05-14 18:39:59 +02:00
xmpp	fixed ping time out after session resume	2014-05-20 11:05:03 +02:00