Merge branch 'master' into otr
Conflicts: bower.json converse.css converse.js main.js tests_main.js
Showing
build.js
0 → 100644
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/nolocales.js
0 → 100644
test_minified.html
deleted
100644 → 0
Please register or sign in to comment