Merge branch '0.6.x'
Conflicts: converse.js index.html Add config option ``allow_contact_requests`` to toggle user adding
Showing
Please register or sign in to comment
Conflicts: converse.js index.html Add config option ``allow_contact_requests`` to toggle user adding