Commit c214000e authored by JC Brand's avatar JC Brand

Merge branch '0.6.x'

Conflicts:
	converse.min.js
parents 4f44be9e 86eef5b1
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment