cea68e5af0
Conflicts: docs/CHANGES.rst |
||
---|---|---|
.. | ||
chatbox.js | ||
chatroom.js | ||
controlbox.js | ||
converse.js | ||
eventemitter.js | ||
minchats.js | ||
otr.js | ||
profiling.js | ||
register.js |
cea68e5af0
Conflicts: docs/CHANGES.rst |
||
---|---|---|
.. | ||
chatbox.js | ||
chatroom.js | ||
controlbox.js | ||
converse.js | ||
eventemitter.js | ||
minchats.js | ||
otr.js | ||
profiling.js | ||
register.js |