Commit b111e60c authored by JC Brand's avatar JC Brand

Merge branch '0.6.x'

Conflicts:
	converse.js
parents 0752a0e2 fcc1f5ad
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