iNPUTmice 6c3ea7f2bd Merge branch 'development' of https://github.com/siacs/Conversations into development		2015-01-29 23:26:41 +01:00
..
crypto	otr4j: update to 0.22	2015-01-20 18:01:39 +01:00
entities	fix mergable() for /me command.	2015-01-25 16:58:06 +01:00
generator	fixed broken caps	2015-01-28 00:28:00 +01:00
http	Harden the TLS connection cipher suites	2015-01-14 13:10:15 -05:00
parser	muc tics for consistency	2015-01-26 01:25:47 +01:00
persistance	fixed bug in find conference in database method	2015-01-21 16:18:57 +01:00
services	Use Material Design Icons on API 21+	2015-01-29 15:28:26 -05:00
ui	Merge branch 'development' of https://github.com/siacs/Conversations into development	2015-01-29 23:26:41 +01:00
utils	fix mergable() for /me command.	2015-01-25 16:58:06 +01:00
xml	Add support for XEP-0191 (Blocking command)	2014-12-22 08:19:00 -05:00
xmpp	set jingle file transfer to offer after iq offer has returned	2015-01-25 16:32:59 +01:00
Config.java	Harden the TLS connection cipher suites	2015-01-14 13:10:15 -05:00