JC Brand 1ce7620b88 Merge remote-tracking branch 'origin' into 0.8 ... Conflicts: converse.js docs/CHANGES.rst index.html		2014-02-23 02:54:35 +02:00
..
chatbox.js	Clean up after running tests, by closing chatboxes.	2014-01-19 07:02:18 +02:00
chatroom.js	Clean up after running tests, by closing chatboxes.	2014-01-19 07:02:18 +02:00
controlbox.js	More templates refactored into separate files.	2014-01-19 11:22:56 +02:00
converse.js	Add API method to retrieve the SID. Fixes #93	2014-02-12 12:37:39 +02:00
eventemitter.js	Move event emitter tests out into their own spec	2014-02-12 02:02:25 +02:00
otr.js	Refactor some OTR code into a Backbone model and adapt tests.	2014-02-12 07:12:00 +02:00