JC Brand 9849daacf9 Merge branch 'master' into 0.8 ... Conflicts: bower.json converse.js docs/CHANGES.rst spec/chatbox.js tests/utils.js tests_main.js		2014-03-09 08:18:00 +02:00
..
mock.js	Add event emitter tests for chatrooms. Updates #48	2013-12-16 19:19:25 +02:00
utils.js	Merge branch 'master' into 0.8	2014-03-09 08:18:00 +02:00