Daniel Gultsch 4afdd6480a Merge pull request #930 from betheg/otr ... otr: switch to the otr-state the partner alternate.		2015-01-25 20:53:29 +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 mam to work with muc	2015-01-24 00:22:51 +01:00
http
parser	otr: switch to the otr-state the partner alternate.	2015-01-25 13:07:31 +01:00
persistance	fixed bug in find conference in database method	2015-01-21 16:18:57 +01:00
services	fixed mam to work with muc	2015-01-24 00:22:51 +01:00
ui	Merge pull request #930 from betheg/otr	2015-01-25 20:53:29 +01:00
utils	fix mergable() for /me command.	2015-01-25 16:58:06 +01:00
xml
xmpp	set jingle file transfer to offer after iq offer has returned	2015-01-25 16:32:59 +01:00
Config.java