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

Browse Source

Conflicts:
	converse.js
	docs/source/index.rst
	index.html

...

This commit is contained in:

JC Brand 2013-10-20 22:45:03 +02:00

parent 38c26013d0 c6f4943ea6

commit f87900fbff

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available