JC Brand 04912c5c5a Merge branch 'master' into amd-strophe ... Conflicts: docs/CHANGES.rst		2015-02-22 12:53:18 +01:00
..
chatbox.js	Fix failing tests after introducing AMD version of Strophe	2015-02-01 16:15:34 +01:00
chatroom.js	Fix failing tests after introducing AMD version of Strophe	2015-02-01 16:15:34 +01:00
controlbox.js	Fix failing tests after introducing AMD version of Strophe	2015-02-01 16:15:34 +01:00
converse.js	Merge branch 'master' into amd-strophe	2015-02-22 12:53:18 +01:00
eventemitter.js	Fix tests by depending on jquery obj.	2014-10-15 19:16:02 +02:00
minchats.js	Fix failing tests after introducing AMD version of Strophe	2015-02-01 16:15:34 +01:00
otr.js	Fix failing tests after introducing AMD version of Strophe	2015-02-01 16:15:34 +01:00
profiling.js	Fix failing tests after introducing AMD version of Strophe	2015-02-01 16:15:34 +01:00
register.js	Fix failing tests after introducing AMD version of Strophe	2015-02-01 16:15:34 +01:00
xmppstatus.js	Added test case for #305 and updated CHANGES.rst	2015-01-23 12:06:10 -03:00