Merge branch '0.6.x'
Conflicts: converse.min.js
This commit is contained in:
commit
c214000eec
2
converse.min.js
vendored
2
converse.min.js
vendored
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue
Block a user