Browse Source

Merge branch 'master' of github.com:jcbrand/converse.js

Conflicts:
	converse.js
	docs/source/index.rst
	index.html
JC Brand 11 years ago
parent
commit
f87900fbff

Diff Data Not Available.