Merge remote-tracking branch 'origin' into 0.8
Conflicts: converse.js docs/CHANGES.rst index.html
Showing
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
No preview for this file type
locale/he/LC_MESSAGES/he.js
0 → 100644
locale/id/LC_MESSAGES/id.js
0 → 100644
spec/eventemitter.js
0 → 100644
spec/otr.js
0 → 100644
Please register or sign in to comment